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

Commit bd496d27 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove TARGET_TRANSLATE_2ND_ARCH"

parents baa7ca0e 02b50d12

core/base_rules.mk

+0 −16
Original line number Diff line number Diff line
@@ -115,12 +115,6 @@ my_module_tags := $(LOCAL_MODULE_TAGS) 
ifeq ($(my_host_cross),true)

  my_module_tags :=

endif

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

ifdef LOCAL_2ND_ARCH_VAR_PREFIX

# Don't pull in modules by tags if this is for translation TARGET_2ND_ARCH.

  my_module_tags :=

endif

endif



# Ninja has an implicit dependency on the command being run, and kati will

# regenerate the ninja manifest if any read makefile changes, so there is no
@@ -204,17 +198,7 @@ endif 
my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)



ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

# When in TARGET_TRANSLATE_2ND_ARCH both TARGET_ARCH and TARGET_2ND_ARCH are 32-bit,

# to avoid path conflict we force using LOCAL_MODULE_PATH_64 for the first arch.

ifdef LOCAL_2ND_ARCH_VAR_PREFIX

my_multilib_module_path := $(LOCAL_MODULE_PATH_32)

else  # ! LOCAL_2ND_ARCH_VAR_PREFIX

my_multilib_module_path := $(LOCAL_MODULE_PATH_64)

endif  # ! LOCAL_2ND_ARCH_VAR_PREFIX

else  # ! TARGET_TRANSLATE_2ND_ARCH

my_multilib_module_path := $(strip $(LOCAL_MODULE_PATH_$(my_32_64_bit_suffix)))

endif # ! TARGET_TRANSLATE_2ND_ARCH

ifdef my_multilib_module_path

my_module_path := $(my_multilib_module_path)

else

core/dex_preopt_libart.mk

+2 −6
Original line number Diff line number Diff line
@@ -21,11 +21,9 @@ $(my_installed): $(my_installed_vdex_dir)% : $(my_built_vdex_dir)% 
	mkdir -p $(dir $@)/$(TARGET_ARCH)

	ln -sfn ../$(notdir $@) $(dir $@)/$(TARGET_ARCH)

ifdef TARGET_2ND_ARCH

  ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)

	mkdir -p $(dir $@)/$(TARGET_2ND_ARCH)

	ln -sfn ../$(notdir $@) $(dir $@)/$(TARGET_2ND_ARCH)

endif

endif



my_dexpreopt_image_extra_deps := $(firstword $(my_installed))
@@ -33,11 +31,9 @@ my_2nd_arch_prefix := 
include $(BUILD_SYSTEM)/dex_preopt_libart_boot.mk



ifdef TARGET_2ND_ARCH

  ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)

  my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)

  include $(BUILD_SYSTEM)/dex_preopt_libart_boot.mk

endif

endif



my_2nd_arch_prefix :=

core/envsetup.mk

+0 −36
Original line number Diff line number Diff line
@@ -500,12 +500,7 @@ endif 
.KATI_READONLY := TARGET_OUT_SYSTEM_OTHER



# Out for TARGET_2ND_ARCH

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

# With this you can reference the arm binary translation library with libfoo_arm in PRODUCT_PACKAGES.

TARGET_2ND_ARCH_MODULE_SUFFIX := _$(TARGET_2ND_ARCH)

else

TARGET_2ND_ARCH_MODULE_SUFFIX := $(HOST_2ND_ARCH_MODULE_SUFFIX)

endif

.KATI_READONLY := TARGET_2ND_ARCH_MODULE_SUFFIX



ifneq ($(filter address,$(SANITIZE_TARGET)),)
@@ -513,11 +508,7 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),) 
else

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)

endif

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS := $(TARGET_OUT_APPS)
@@ -582,17 +573,10 @@ TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages 
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_DATA_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_APPS := $(TARGET_OUT_DATA_APPS)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest/$(TARGET_2ND_ARCH)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest/$(TARGET_2ND_ARCH)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest/$(TARGET_2ND_ARCH)$(TARGET_VENDOR_TEST_SUFFIX)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest/$(TARGET_2ND_ARCH)$(TARGET_VENDOR_TEST_SUFFIX)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest$(TARGET_VENDOR_TEST_SUFFIX)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest$(TARGET_VENDOR_TEST_SUFFIX)

endif

.KATI_READONLY := \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES \
@@ -644,11 +628,7 @@ TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc 
  TARGET_OUT_VENDOR_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_APPS_PRIVILEGED := $(TARGET_OUT_VENDOR_APPS_PRIVILEGED)
@@ -678,11 +658,7 @@ TARGET_OUT_OEM_ETC := $(TARGET_OUT_OEM)/etc 
  TARGET_OUT_OEM_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_EXECUTABLES := $(TARGET_OUT_OEM_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_APPS := $(TARGET_OUT_OEM_APPS)

.KATI_READONLY := \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_EXECUTABLES \
@@ -728,11 +704,7 @@ TARGET_OUT_ODM_ETC := $(TARGET_OUT_ODM)/etc 
  TARGET_OUT_ODM_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS_PRIVILEGED := $(TARGET_OUT_ODM_APPS_PRIVILEGED)
@@ -778,11 +750,7 @@ TARGET_OUT_PRODUCT_ETC := $(TARGET_OUT_PRODUCT)/etc 
  TARGET_OUT_PRODUCT_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_EXECUTABLES := $(TARGET_OUT_PRODUCT_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES := $(target_out_product_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES := $(target_out_product_shared_libraries_base)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS := $(TARGET_OUT_PRODUCT_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS_PRIVILEGED := $(TARGET_OUT_PRODUCT_APPS_PRIVILEGED)

.KATI_READONLY := \
@@ -825,11 +793,7 @@ TARGET_OUT_SYSTEM_EXT_EXECUTABLES := $(TARGET_OUT_SYSTEM_EXT)/bin 
  TARGET_OUT_SYSTEM_EXT_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_EXECUTABLES := $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES := $(target_out_system_ext_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES := $(target_out_system_ext_shared_libraries_base)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS := $(TARGET_OUT_SYSTEM_EXT_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED := $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)

.KATI_READONLY := \

core/executable.mk

+0 −9
Original line number Diff line number Diff line
@@ -20,15 +20,6 @@ endif 
ifneq (true,$(my_skip_this_target))

$(call record-module-type,EXECUTABLE)



ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

# If a native test explicity specifies to build only for the translation arch,

# we'll still need LOCAL_MULTILIB=both and let module_arch_supported.mk choose

# to build only for TARGET_2ND_ARCH.

ifneq (1,$(words $(LOCAL_MODULE_TARGET_ARCH)))

LOCAL_MULTILIB := first

endif

endif



my_prefix := TARGET_

include $(BUILD_SYSTEM)/multilib.mk

core/main.mk

+0 −10
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ CUSTOM_MODULES := \ 
#

# Resolve the required module name to 32-bit or 64-bit variant.

# Get a list of corresponding 32-bit module names, if one exists.

ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)

define get-32-bit-modules

$(sort $(foreach m,$(1),\

  $(if $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).CLASS),\
@@ -504,15 +503,6 @@ $(sort $(foreach m,$(1),\ 
    $(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX), \

    $(m))))

endef

else  # TARGET_TRANSLATE_2ND_ARCH

# For binary translation config, by default only install the first arch.

define get-32-bit-modules

endef



define get-32-bit-modules-if-we-can

$(strip $(1))

endef

endif  # TARGET_TRANSLATE_2ND_ARCH



# TODO: we can probably check to see if these modules are actually host

# modules