auto import from //branches/cupcake/...@137873 (fdd3a102) · Commits · e / os / android_build

cleanspec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libjni_andpyime_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

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

core/armelf.x

+7 −1

Original line number	Diff line number	Diff line
		@@ -188,9 +188,15 @@ SECTIONS
		.debug_funcnames 0 : { *(.debug_funcnames) }
		.debug_typenames 0 : { *(.debug_typenames) }
		.debug_varnames 0 : { *(.debug_varnames) }
		/* Adding the word ABSOLUTE below, so that the _stack below won't float
		into a random section. If _stack is not absolutely with .stack section,
		we saw that sometimes _stack got inserted into the .debug_frame section
		because it's processed by the linker at that moment. As a result, _stack
		symbol will get wrongly moved and gelf_update_symshndx() will return
		invalid data. */
		.stack 0x80000 :
		{
		_stack = .;
		_stack = ABSOLUTE(.);
		*(.stack)
		}
		.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }

core/armelf.xsc

+7 −1

Original line number	Diff line number	Diff line
		@@ -190,9 +190,15 @@ SECTIONS
		.debug_funcnames 0 : { *(.debug_funcnames) }
		.debug_typenames 0 : { *(.debug_typenames) }
		.debug_varnames 0 : { *(.debug_varnames) }
		/* Adding the word ABSOLUTE below, so that the _stack below won't float
		into a random section. If _stack is not absolutely with .stack section,
		we saw that sometimes _stack got inserted into the .debug_frame section
		because it's processed by the linker at that moment. As a result, _stack
		symbol will get wrongly moved and gelf_update_symshndx() will return
		invalid data. */
		.stack 0x80000 :
		{
		_stack = .;
		_stack = ABSOLUTE(.);
		*(.stack)
		}
		.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }

core/main.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,9 @@ endif # !enable_target_debugging

		ifeq ($(TARGET_BUILD_VARIANT),eng)
		tags_to_install := user debug eng
		# Don't require the setup wizard on eng builds
		ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\
		$(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES)))
		endif

		## tests ##

core/tasks/cts.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,10 @@ CTS_CASE_LIST := \
		CtsContentTestCases \
		CtsDatabaseTestCases \
		CtsGraphicsTestCases \
		CtsHardwareTestCases \
		CtsLocationTestCases \
		CtsOsTestCases \
		CtsPermissionTestCases \
		CtsProviderTestCases \
		CtsTextTestCases \
		CtsUtilTestCases \
		@@ -110,7 +112,7 @@ $(CORE_VM_TEST_PLAN): PRIVATE_JAVAOPTS:=-Xmx256M
		$(CORE_VM_TEST_PLAN): PRIVATE_CUSTOM_TOOL := java $(PRIVATE_JAVAOPTS) \
		-classpath $(PRIVATE_CLASSPATH) \
		$(PRIVATE_PARAMS) CollectAllTests $(CORE_VM_TEST_PLAN) \
		cts/tests/vm-tests/AndroidManifest.xml dot.junit.AllJunitHostTests
		cts/tests/vm-tests/AndroidManifest.xml dot.junit.AllJunitHostTests cts/tools/vm-tests/Android.mk
		# Please see big comment above on why this line depends on javalib.jar instead of classes.jar
		$(CORE_VM_TEST_PLAN): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INTERMEDIATES)/javalib.jar $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(TESTS_INTERMEDIATES)/javalib.jar $(cts_dir)/all_cts_files_stamp \| $(ACP)
		@echo "Generate the CTS vm-test plan: $@"
		@@ -119,7 +121,7 @@ $(CORE_VM_TEST_PLAN): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INT
		$(ACP) -fv $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(PRIVATE_DIR)/repository/testcases/android.core.vm-tests.jar

		# Generate the default test plan for User.
		$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh
		$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh $(CORE_VM_TEST_PLAN) $(CORE_TEST_PLAN)
		$(hide) bash $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh cts/tests/tests/ \
		$(PRIVATE_DIR) $(TMP_DIR) $(TOP) $(TARGET_COMMON_OUT_ROOT) $(OUT_DIR)