diff options
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/board_config.mk | 9 | ||||
| -rw-r--r-- | core/config.mk | 6 | ||||
| -rw-r--r-- | core/executable.mk | 10 | ||||
| -rw-r--r-- | core/executable_prefer_symlink.mk | 13 | ||||
| -rw-r--r-- | core/package.mk | 14 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | target/product/mainline_system.mk | 1 |
8 files changed, 6 insertions, 51 deletions
diff --git a/core/Makefile b/core/Makefile index 27f8756e71..561368d4be 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3955,7 +3955,7 @@ built_ota_tools := # We can't build static executables when SANITIZE_TARGET=address ifeq (,$(filter address, $(SANITIZE_TARGET))) built_ota_tools += \ - $(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater + $(call intermediates-dir-for,EXECUTABLES,updater)/updater endif $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools) diff --git a/core/board_config.mk b/core/board_config.mk index 0ff28c5fdf..72ba568bbb 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -242,13 +242,8 @@ endif # build a list out of the TARGET_CPU_ABIs specified by the config. # Add NATIVE_BRIDGE_ABIs at the end to keep order of preference. ifeq (,$(TARGET_CPU_ABI_LIST)) - ifeq ($(TARGET_IS_64_BIT)|$(TARGET_PREFER_32_BIT_APPS),true|true) - TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT) $(TARGET_CPU_ABI_LIST_64_BIT) \ - $(_target_native_bridge_abi_list_32_bit) $(_target_native_bridge_abi_list_64_bit) - else - TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_64_BIT) $(TARGET_CPU_ABI_LIST_32_BIT) \ - $(_target_native_bridge_abi_list_64_bit) $(_target_native_bridge_abi_list_32_bit) - endif + TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_64_BIT) $(TARGET_CPU_ABI_LIST_32_BIT) \ + $(_target_native_bridge_abi_list_64_bit) $(_target_native_bridge_abi_list_32_bit) endif # Add NATIVE_BRIDGE_ABIs at the end of 32 and 64 bit CPU_ABIs to keep order of preference. diff --git a/core/config.mk b/core/config.mk index 5be1b8680f..6bcdda2c43 100644 --- a/core/config.mk +++ b/core/config.mk @@ -141,6 +141,7 @@ $(KATI_obsolete_var \ TARGET_PROJECT_SYSTEM_INCLUDES \ 2ND_TARGET_PROJECT_SYSTEM_INCLUDES \ ,Project include variables have been removed) +$(KATI_obsolete_var TARGET_PREFER_32_BIT TARGET_PREFER_32_BIT_APPS TARGET_PREFER_32_BIT_EXECUTABLES) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE @@ -375,11 +376,6 @@ include $(BUILD_SYSTEM)/goma.mk include $(BUILD_SYSTEM)/rbe.mk endif -ifdef TARGET_PREFER_32_BIT -TARGET_PREFER_32_BIT_APPS := true -TARGET_PREFER_32_BIT_EXECUTABLES := true -endif - # GCC version selection TARGET_GCC_VERSION := 4.9 ifdef TARGET_2ND_ARCH diff --git a/core/executable.mk b/core/executable.mk index db8dcc6318..9175e0ad65 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -40,14 +40,9 @@ else #!LOCAL_MULTILIB == both LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true endif -# if TARGET_PREFER_32_BIT_EXECUTABLES is set, try to build 32-bit first ifdef TARGET_2ND_ARCH -ifeq ($(TARGET_PREFER_32_BIT_EXECUTABLES),true) -LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) -else LOCAL_2ND_ARCH_VAR_PREFIX := endif -endif my_skip_non_preferred_arch := @@ -65,12 +60,7 @@ endif ifndef my_skip_non_preferred_arch ifdef TARGET_2ND_ARCH -# check if the non-preferred arch is the primary or secondary -ifeq ($(TARGET_PREFER_32_BIT_EXECUTABLES),true) -LOCAL_2ND_ARCH_VAR_PREFIX := -else LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) -endif # check if non-preferred arch is supported include $(BUILD_SYSTEM)/module_arch_supported.mk diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk index ad6698df66..fea0bef64b 100644 --- a/core/executable_prefer_symlink.mk +++ b/core/executable_prefer_symlink.mk @@ -5,22 +5,13 @@ # Note: now only limited to the binaries that will be installed under system/bin directory # Create link to the one used depending on the target -# configuration. Note that we require the TARGET_IS_64_BIT -# check because 32 bit targets may not define TARGET_PREFER_32_BIT_APPS -# et al. since those variables make no sense in that context. +# configuration. ifneq ($(LOCAL_IS_HOST_MODULE),true) my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE)) my_src_binary_name := ifeq ($(TARGET_IS_64_BIT),true) ifeq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(TARGET_SUPPORTS_32_BIT_APPS),true|true) - # We support both 32 and 64 bit apps, so we will have to - # base our decision on whether the target prefers one or the - # other. - ifeq ($(TARGET_PREFER_32_BIT_APPS),true) - my_src_binary_name := $(LOCAL_MODULE_STEM_32) - else - my_src_binary_name := $(LOCAL_MODULE_STEM_64) - endif + my_src_binary_name := $(LOCAL_MODULE_STEM_64) else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true) # We support only 64 bit apps. my_src_binary_name := $(LOCAL_MODULE_STEM_64) diff --git a/core/package.mk b/core/package.mk index 6bde48553d..591f7aafdb 100644 --- a/core/package.mk +++ b/core/package.mk @@ -41,15 +41,7 @@ else endif LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true - -# if TARGET_PREFER_32_BIT_APPS is set, try to build 32-bit first -ifdef TARGET_2ND_ARCH -ifeq ($(TARGET_PREFER_32_BIT_APPS),true) -LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) -else LOCAL_2ND_ARCH_VAR_PREFIX := -endif -endif # check if preferred arch is supported include $(BUILD_SYSTEM)/module_arch_supported.mk @@ -57,13 +49,7 @@ ifeq ($(my_module_arch_supported),true) # first arch is supported include $(BUILD_SYSTEM)/package_internal.mk else ifneq (,$(TARGET_2ND_ARCH)) -# check if the non-preferred arch is the primary or secondary -ifeq ($(TARGET_PREFER_32_BIT_APPS),true) -LOCAL_2ND_ARCH_VAR_PREFIX := -else LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) -endif - # check if non-preferred arch is supported include $(BUILD_SYSTEM)/module_arch_supported.mk ifeq ($(my_module_arch_supported),true) diff --git a/core/soong_config.mk b/core/soong_config.mk index 18949bef28..c3e8c2b486 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -122,8 +122,6 @@ $(call add_json_bool, ArtUseReadBarrier, $(call invert_bool,$(fi $(call add_json_bool, Binder32bit, $(BINDER32BIT)) $(call add_json_str, BtConfigIncludeDir, $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)) $(call add_json_list, DeviceKernelHeaders, $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS)) -$(call add_json_bool, DevicePrefer32BitApps, $(filter true,$(TARGET_PREFER_32_BIT_APPS))) -$(call add_json_bool, DevicePrefer32BitExecutables, $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES))) $(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION)) $(call add_json_str, Platform_vndk_version, $(PLATFORM_VNDK_VERSION)) $(call add_json_str, ProductVndkVersion, $(PRODUCT_PRODUCT_VNDK_VERSION)) diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index bed1b28318..f21a4e42f5 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -118,7 +118,6 @@ PRODUCT_HOST_PACKAGES += \ PRODUCT_COPY_FILES += \ system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \ system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \ - system/core/rootdir/init.zygote32_64.rc:system/etc/init/hw/init.zygote32_64.rc \ system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \ # Enable dynamic partition size |