From ccd2def288d02ce5adab10bb28878fff05b70aed Mon Sep 17 00:00:00 2001 From: Phil Dubach <> Date: Mon, 27 Apr 2009 12:07:38 -0700 Subject: [PATCH] AI 147847: CTS: Fix core test dependencies in CTS makefile The core test descriptions did not list all dependencies. When building cts for the first time, the descriptions were generated before the cts repository was erased. BUG=1813815 Automated import of CL 147847 --- core/tasks/cts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 76775a514..944437781 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -118,7 +118,7 @@ $(cts_dir)/all_cts_core_files_stamp: PRIVATE_PARAMS+=-Dcts.useEnhancedJunit=true # build system requires that dependencies use javalib.jar. If # javalib.jar is up-to-date, then classes.jar is as well. Depending # on classes.jar will build the files incorrectly. -$(cts_dir)/all_cts_core_files_stamp: $(CTS_CORE_CASE_LIST) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INTERMEDIATES)/javalib.jar $(TESTS_INTERMEDIATES)/javalib.jar | $(ACP) +$(cts_dir)/all_cts_core_files_stamp: $(CTS_CORE_CASE_LIST) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INTERMEDIATES)/javalib.jar $(TESTS_INTERMEDIATES)/javalib.jar $(cts_dir)/all_cts_files_stamp | $(ACP) $(call generate-core-test-description,$(cts_dir)/$(cts_name)/repository/testcases/android.core.tests.annotation,\ cts/tests/core/annotation/AndroidManifest.xml,\ tests.annotation.AllTests) -- 2.11.0