diff --git a/core/clang/config.mk b/core/clang/config.mk index 7113892fb..c2a0bf486 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -138,11 +138,6 @@ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan # provides to Clang (for supporting features like -ftrapv). COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras -ifeq ($(HOST_PREFER_32_BIT),true) -# We don't have 32-bit prebuilt libLLVM/libclang, so force to build them from source. -FORCE_BUILD_LLVM_COMPONENTS := true -endif - # A list of projects that are allowed to set LOCAL_CLANG to false. # INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS is defined later in other config.mk. LOCAL_CLANG_EXCEPTION_PROJECTS = \ diff --git a/core/envsetup.mk b/core/envsetup.mk index 3ecd2193c..a221fb91d 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -298,11 +298,7 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest # The default host library path. # It always points to the path where we build libraries in the default bitness. -ifeq ($(HOST_PREFER_32_BIT),true) -HOST_LIBRARY_PATH := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES) -else HOST_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES) -endif # Out for HOST_CROSS_2ND_ARCH HOST_CROSS_2ND_ARCH_VAR_PREFIX := 2ND_ diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk index e59e8c232..9b9814e3b 100644 --- a/core/executable_prefer_symlink.mk +++ b/core/executable_prefer_symlink.mk @@ -33,11 +33,7 @@ ifneq ($(LOCAL_IS_HOST_MODULE),true) endif else my_symlink := $(addprefix $(HOST_OUT)/bin/, $(LOCAL_MODULE)) - ifneq ($(HOST_PREFER_32_BIT),true) - my_src_binary_name := $(LOCAL_MODULE_STEM_64) - else - my_src_binary_name := $(LOCAL_MODULE_STEM_32) - endif + my_src_binary_name := $(LOCAL_MODULE_STEM_64) endif $(call symlink-file,$(my_module_path)/$(my_src_binary_name),$(my_src_binary_name),$(my_symlink)) diff --git a/core/host_executable.mk b/core/host_executable.mk index 78223eba1..1480c2c0c 100644 --- a/core/host_executable.mk +++ b/core/host_executable.mk @@ -6,14 +6,10 @@ include $(BUILD_SYSTEM)/multilib.mk ifndef LOCAL_MODULE_HOST_ARCH ifndef my_module_multilib -ifeq ($(HOST_PREFER_32_BIT),true) -my_module_multilib := 32 -else # By default we only build host module for the first arch. my_module_multilib := first endif endif -endif ifeq ($(LOCAL_NO_FPIE),) LOCAL_LDFLAGS += $(HOST_FPIE_FLAGS) diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index df24b63af..5da791327 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -6,14 +6,10 @@ include $(BUILD_SYSTEM)/multilib.mk ifndef LOCAL_MODULE_HOST_ARCH ifndef my_module_multilib -ifeq ($(HOST_PREFER_32_BIT),true) -my_module_multilib := 32 -else # libraries default to building for both architecturess my_module_multilib := both endif endif -endif LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk diff --git a/core/host_static_library.mk b/core/host_static_library.mk index 61f55697c..aa0421e5e 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -6,14 +6,10 @@ include $(BUILD_SYSTEM)/multilib.mk ifndef LOCAL_MODULE_HOST_ARCH ifndef my_module_multilib -ifeq ($(HOST_PREFER_32_BIT),true) -my_module_multilib := 32 -else # libraries default to building for both architecturess my_module_multilib := both endif endif -endif LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk diff --git a/core/soong.mk b/core/soong.mk index 29a91e2aa..50831ba97 100644 --- a/core/soong.mk +++ b/core/soong.mk @@ -53,7 +53,6 @@ $(SOONG_VARIABLES): FORCE echo ' "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \ echo ' "Binder32bit": $(if $(BINDER32BIT),true,false),'; \ echo ' "DevicePrefer32BitExecutables": $(if $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)),true,false),'; \ - echo ' "HostPrefer32BitExecutables": $(if $(filter true,$(HOST_PREFER_32_BIT)),true,false),'; \ echo ' "UseGoma": $(if $(filter-out false,$(USE_GOMA)),true,false),'; \ echo ''; \ echo ' "DeviceName": "$(TARGET_DEVICE)",'; \