From 51a1ae1d24e37c8df0be7c7260148ea5cbe5fbdc Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 10 Jul 2013 11:33:27 -0700 Subject: [PATCH] Clean up files' dependencies on phony targets. Module names are phony targets, which make always sees as obsolete, so a nothing-to-do build won't do nothing. Also file target $(DEFAULT_TEST_PLAN) was never created in its rule. Here it's fixed with a stamp file. Bug:9761012 Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce --- core/tasks/cts.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 9154f32cf5..b2fb79ea57 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -45,10 +45,9 @@ CTS_CORE_CASES := $(foreach pkg,$(CTS_CORE_CASE_LIST),$(call intermediates-dir-f CTS_CASE_LIST := $(CTS_CORE_CASE_LIST) $(CTS_TEST_CASE_LIST) DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans - +CTS_TEST_CASE_LIST_FILES := $(foreach c, $(CTS_TEST_CASE_LIST), $(call intermediates-dir-for,APPS,$(c))/package.apk) $(cts_dir)/all_cts_files_stamp: PRIVATE_JUNIT_HOST_JAR := $(junit_host_jar) - -$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_TEST_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) +$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_TEST_CASE_LIST_FILES) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) # Make necessary directory for CTS $(hide) rm -rf $(PRIVATE_CTS_DIR) $(hide) mkdir -p $(TMP_DIR) @@ -159,6 +158,7 @@ $(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_tools_src_dir)/utils/ $(hide) $(ACP) -fp $(CTS_CORE_XMLS) $(CTS_TEST_XMLS) $(CORE_VM_TEST_TF_DESC) $(PRIVATE_DIR)/repository/testcases $(hide) $(cts_tools_src_dir)/utils/buildCts.py cts/tests/tests/ $(PRIVATE_DIR) $(TMP_DIR) \ $(TOP) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar + $(hide) mkdir -p $(dir $@) && touch $@ # Package CTS and clean up. #