Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71e9c323 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6e am: 534b035e 

Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: Ib72e06fd5b674606403bee352d3ddbd93d7430c7
parents 949a33b1 534b035e

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/board_config.mk

+2 −7
Original line number Diff line number Diff line
@@ -242,14 +242,9 @@ 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

endif



# Add NATIVE_BRIDGE_ABIs at the end of 32 and 64 bit CPU_ABIs to keep order of preference.

TARGET_CPU_ABI_LIST_32_BIT += $(_target_native_bridge_abi_list_32_bit)

core/config.mk

+1 −5
Original line number Diff line number Diff line
@@ -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

core/executable.mk

+0 −10
Original line number Diff line number Diff line
@@ -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

core/executable_prefer_symlink.mk

+2 −11
Original line number Diff line number Diff line
@@ -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

    else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)

      # We support only 64 bit apps.

      my_src_binary_name := $(LOCAL_MODULE_STEM_64)