|
|
|
@ -543,13 +543,11 @@ HOST_CROSS_OUT_TESTCASES := $(HOST_CROSS_OUT)/testcases
|
|
|
|
|
HOST_CROSS_OUT_TESTCASES
|
|
|
|
|
|
|
|
|
|
HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj
|
|
|
|
|
HOST_OUT_INTERMEDIATE_LIBRARIES := $(HOST_OUT_INTERMEDIATES)/lib
|
|
|
|
|
HOST_OUT_NOTICE_FILES := $(HOST_OUT_INTERMEDIATES)/NOTICE_FILES
|
|
|
|
|
HOST_OUT_COMMON_INTERMEDIATES := $(HOST_COMMON_OUT_ROOT)/obj
|
|
|
|
|
HOST_OUT_FAKE := $(HOST_OUT)/fake_packages
|
|
|
|
|
.KATI_READONLY := \
|
|
|
|
|
HOST_OUT_INTERMEDIATES \
|
|
|
|
|
HOST_OUT_INTERMEDIATE_LIBRARIES \
|
|
|
|
|
HOST_OUT_NOTICE_FILES \
|
|
|
|
|
HOST_OUT_COMMON_INTERMEDIATES \
|
|
|
|
|
HOST_OUT_FAKE
|
|
|
|
@ -558,11 +556,9 @@ HOST_OUT_FAKE := $(HOST_OUT)/fake_packages
|
|
|
|
|
include $(BUILD_SYSTEM)/aux_config.mk
|
|
|
|
|
|
|
|
|
|
HOST_CROSS_OUT_INTERMEDIATES := $(HOST_CROSS_OUT)/obj
|
|
|
|
|
HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES := $(HOST_CROSS_OUT_INTERMEDIATES)/lib
|
|
|
|
|
HOST_CROSS_OUT_NOTICE_FILES := $(HOST_CROSS_OUT_INTERMEDIATES)/NOTICE_FILES
|
|
|
|
|
.KATI_READONLY := \
|
|
|
|
|
HOST_CROSS_OUT_INTERMEDIATES \
|
|
|
|
|
HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES \
|
|
|
|
|
HOST_CROSS_OUT_NOTICE_FILES
|
|
|
|
|
|
|
|
|
|
HOST_OUT_GEN := $(HOST_OUT)/gen
|
|
|
|
@ -581,7 +577,6 @@ HOST_OUT_TEST_CONFIG := $(HOST_OUT)/test_config
|
|
|
|
|
HOST_2ND_ARCH_VAR_PREFIX := 2ND_
|
|
|
|
|
HOST_2ND_ARCH_MODULE_SUFFIX := _32
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj32
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT_JAVA_LIBRARIES)
|
|
|
|
@ -591,7 +586,6 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_TESTCASES := $(HOST_OUT_TESTCASES)
|
|
|
|
|
HOST_2ND_ARCH_VAR_PREFIX \
|
|
|
|
|
HOST_2ND_ARCH_MODULE_SUFFIX \
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES \
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES \
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES \
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES \
|
|
|
|
|
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_JAVA_LIBRARIES \
|
|
|
|
@ -607,7 +601,6 @@ HOST_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)
|
|
|
|
|
HOST_CROSS_2ND_ARCH_VAR_PREFIX := 2ND_
|
|
|
|
|
HOST_CROSS_2ND_ARCH_MODULE_SUFFIX := _64
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATES := $(HOST_CROSS_OUT)/obj64
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATES)/lib
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS_OUT)/lib64
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT_EXECUTABLES)
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest64
|
|
|
|
@ -615,7 +608,6 @@ $(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT
|
|
|
|
|
HOST_CROSS_2ND_ARCH_VAR_PREFIX \
|
|
|
|
|
HOST_CROSS_2ND_ARCH_MODULE_SUFFIX \
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATES \
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES \
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_SHARED_LIBRARIES \
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_EXECUTABLES \
|
|
|
|
|
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_NATIVE_TESTS
|
|
|
|
@ -626,8 +618,7 @@ else
|
|
|
|
|
TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj
|
|
|
|
|
endif
|
|
|
|
|
TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include
|
|
|
|
|
TARGET_OUT_INTERMEDIATE_LIBRARIES := $(TARGET_OUT_INTERMEDIATES)/lib
|
|
|
|
|
.KATI_READONLY := TARGET_OUT_INTERMEDIATES TARGET_OUT_HEADERS TARGET_OUT_INTERMEDIATE_LIBRARIES
|
|
|
|
|
.KATI_READONLY := TARGET_OUT_INTERMEDIATES TARGET_OUT_HEADERS
|
|
|
|
|
|
|
|
|
|
ifneq ($(filter address,$(SANITIZE_TARGET)),)
|
|
|
|
|
TARGET_OUT_COMMON_INTERMEDIATES := $(TARGET_COMMON_OUT_ROOT)/obj_asan
|
|
|
|
@ -716,7 +707,6 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),)
|
|
|
|
|
else
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)
|
|
|
|
|
endif
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib
|
|
|
|
|
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
|
|
|
|
@ -729,7 +719,6 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT_APPS_PRI
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_TESTCASES := $(TARGET_OUT_TESTCASES)
|
|
|
|
|
.KATI_READONLY := \
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES \
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES \
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES \
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_RENDERSCRIPT_BITCODE \
|
|
|
|
|
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES \
|
|
|
|
|