resolve merge conflicts of e4f77886611d1b4f8b5018dc6d4cc027da0a77a6 to nyc-dr1-dev (e53bed3f) · Commits · e / os / android_build

CleanSpec.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -378,6 +378,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sdcard)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*)

		$(call add-clean-step, rm -rf $(HOST_OUT_TESTCASES))
		$(call add-clean-step, rm -rf $(TARGET_OUT_TESTCASES))

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************

core/base_rules.mk

+12 −3

Original line number	Diff line number	Diff line
		@@ -375,9 +375,13 @@ ifneq ($(words $(LOCAL_COMPATIBILITY_SUITE)),1)
		$(error $(LOCAL_PATH):$(LOCAL_MODULE) LOCAL_COMPATIBILITY_SUITE can be only one name)
		endif

		# Copy this module into its own subdirectory in the common testcases output directory.
		my_testcases_subdir := $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)

		# The module itself.
		my_compat_dist := \
		$(LOCAL_BUILT_MODULE):$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(my_installed_module_stem)
		$(LOCAL_BUILT_MODULE):$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(my_installed_module_stem) \
		$(LOCAL_BUILT_MODULE):$(my_testcases_subdir)/$(my_installed_module_stem)

		# Make sure we only add the files once for multilib modules.
		ifndef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
		@@ -387,17 +391,22 @@ $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files := true
		my_compat_dist += $(foreach f, $(LOCAL_COMPATIBILITY_SUPPORT_FILES),\
		$(eval p := $(subst :,$(space),$(f)))\
		$(eval s := $(word 1,$(p)))\
		$(eval d := $(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(or $(word 2,$(p)),$(notdir $(word 1,$(p)))))\
		$(s):$(d))
		$(eval n := $(or $(word 2,$(p)),$(notdir $(word 1, $(p))))) \
		$(eval d := $(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(n)) \
		$(s):$(d) $(s):$(my_testcases_subdir)/$(n))

		ifneq (,$(wildcard $(LOCAL_PATH)/AndroidTest.xml))
		my_compat_dist += \
		$(LOCAL_PATH)/AndroidTest.xml:$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE).config
		my_compat_dist += \
		$(LOCAL_PATH)/AndroidTest.xml:$(my_testcases_subdir)/$(LOCAL_MODULE).config
		endif

		ifneq (,$(wildcard $(LOCAL_PATH)/DynamicConfig.xml))
		my_compat_dist += \
		$(LOCAL_PATH)/DynamicConfig.xml:$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE).dynamic
		my_compat_dist += \
		$(LOCAL_PATH)/DynamicConfig.xml:$(my_testcases_subdir)/$(LOCAL_MODULE).dynamic
		endif
		endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files

core/envsetup.mk

+7 −0

Original line number	Diff line number	Diff line
		@@ -259,6 +259,9 @@ HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon

		HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT)/bin
		HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS_OUT)/lib
		HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest
		HOST_CROSS_OUT_COVERAGE := $(HOST_CROSS_OUT)/coverage
		HOST_OUT_TESTCASES := $(HOST_OUT)/testcases

		HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj
		HOST_OUT_HEADERS := $(HOST_OUT_INTERMEDIATES)/include
		@@ -285,6 +288,8 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_
		$(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)
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_TESTCASES := $(HOST_OUT_TESTCASES)

		# The default host library path.
		# It always points to the path where we build libraries in the default bitness.
		@@ -335,6 +340,7 @@ TARGET_OUT_KEYCHARS := $(TARGET_OUT)/usr/keychars
		TARGET_OUT_ETC := $(TARGET_OUT)/etc
		TARGET_OUT_NOTICE_FILES := $(TARGET_OUT_INTERMEDIATES)/NOTICE_FILES
		TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages
		TARGET_OUT_TESTCASES := $(PRODUCT_OUT)/testcases

		TARGET_OUT_SYSTEM_OTHER := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM_OTHER)

		@@ -348,6 +354,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_A
		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)
		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS := $(TARGET_OUT_APPS)
		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT_APPS_PRIVILEGED)
		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_TESTCASES := $(TARGET_OUT_TESTCASES)

		TARGET_OUT_DATA := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)
		TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)

core/package_internal.mk

+5 −2

Original line number	Diff line number	Diff line
		@@ -639,12 +639,15 @@ ifdef LOCAL_COMPATIBILITY_SUITE
		cts_testcase_file := $(foreach s,$(my_split_suffixes),$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE)_$(s).apk)
		$(cts_testcase_file) : $(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE)_%.apk : $(built_module_path)/package_%.apk \| $(ACP)
		$(copy-file-to-new-target)
		common_testcase_file := $(foreach s,$(my_split_suffixes),$($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)/$(LOCAL_MODULE)_$(s).apk)
		$(common_testcase_file) : $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)/$(LOCAL_MODULE)_%.apk : $(built_module_path)/package_%.apk
		$(copy-file-to-new-target)

		COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES := \
		$(COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES) \
		$(cts_testcase_file)
		$(cts_testcase_file) $(common_testcase_file)

		$(my_register_name) : $(cts_testcase_file)
		$(my_register_name) : $(cts_testcase_file) $(common_testcase_file)
		endif # LOCAL_COMPATIBILITY_SUITE
		endif # LOCAL_PACKAGE_SPLITS