@ -500,12 +500,7 @@ endif
.KATI_READONLY := TARGET_OUT_SYSTEM_OTHER
# Out for TARGET_2ND_ARCH
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
# With this you can reference the arm binary translation library with libfoo_arm in PRODUCT_PACKAGES.
TARGET_2ND_ARCH_MODULE_SUFFIX := _$( TARGET_2ND_ARCH)
e l s e
TARGET_2ND_ARCH_MODULE_SUFFIX := $( HOST_2ND_ARCH_MODULE_SUFFIX)
e n d i f
.KATI_READONLY := TARGET_2ND_ARCH_MODULE_SUFFIX
i f n e q ( $( filter address ,$ ( SANITIZE_TARGET ) ) , )
@ -513,11 +508,7 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),)
e l s e
$( TARGET_2ND_ARCH_VAR_PREFIX) TARGET_OUT_INTERMEDIATES := $( PRODUCT_OUT) /obj_$( TARGET_2ND_ARCH)
e n d i f
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $( target_out_shared_libraries_base) /lib/$( TARGET_2ND_ARCH)
e l s e
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $( target_out_shared_libraries_base) /lib
e n d i f
$(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)
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(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)
e l s e
$(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)
e n d i f
.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)
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $( target_out_vendor_shared_libraries_base) /lib/$( TARGET_2ND_ARCH)
e l s e
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $( target_out_vendor_shared_libraries_base) /lib
e n d i f
$(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)
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_SHARED_LIBRARIES := $( TARGET_OUT_OEM) /lib/$( TARGET_2ND_ARCH)
e l s e
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_SHARED_LIBRARIES := $( TARGET_OUT_OEM) /lib
e n d i f
$(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)
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $( target_out_odm_shared_libraries_base) /lib/$( TARGET_2ND_ARCH)
e l s e
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $( target_out_odm_shared_libraries_base) /lib
e n d i f
$(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)
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES := $( target_out_product_shared_libraries_base) /lib/$( TARGET_2ND_ARCH)
e l s e
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES := $( target_out_product_shared_libraries_base) /lib
e n d i f
$(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)
i f e q ( $( TARGET_TRANSLATE_ 2ND_ARCH ) , t r u e )
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES := $( target_out_system_ext_shared_libraries_base) /lib/$( TARGET_2ND_ARCH)
e l s e
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES := $( target_out_system_ext_shared_libraries_base) /lib
e n d i f
$(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 := \