diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-29 05:45:56 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-29 05:49:08 -0700 |
| commit | 16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4 (patch) | |
| tree | 9e7ac00bca78d766dbb3badeeea6c2005206b08d | |
| parent | 0f8fcbe271cad06cb21e0c4602baf35758f4adb1 (diff) | |
| parent | ba8d47b764a3f4fb53b2cb5fcdc1279f35fadb74 (diff) | |
| download | build-16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4.tar.gz | |
Merge from AOSP froyo. Do not merge.android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
| -rw-r--r-- | core/tasks/cts.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index bcec5ab632..981c19b61c 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -27,6 +27,7 @@ CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar +DDMLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/ddmlib.jar CTS_CORE_CASE_LIST := android.core.tests.annotation \ android.core.tests.archive \ @@ -176,14 +177,14 @@ VMTESTS_INTERMEDIATES :=$(call intermediates-dir-for,EXECUTABLES,vm-tests,1,) TESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON) CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON) -GEN_CLASSPATH := $(CORE_INTERMEDIATES)/classes.jar:$(TESTS_INTERMEDIATES)/classes.jar:$(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar:$(HOST_OUT_JAVA_LIBRARIES)/descGen.jar:$(HOST_JDK_TOOLS_JAR) +GEN_CLASSPATH := $(CORE_INTERMEDIATES)/classes.jar:$(TESTS_INTERMEDIATES)/classes.jar:$(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar:$(HOST_OUT_JAVA_LIBRARIES)/descGen.jar:$(HOSTTESTLIB_JAR):$(DDMLIB_JAR):$(HOST_JDK_TOOLS_JAR) $(CORE_VM_TEST_DESC): PRIVATE_CLASSPATH:=$(GEN_CLASSPATH) $(CORE_VM_TEST_DESC): PRIVATE_PARAMS:=-Dcts.useSuppliedTestResult=true $(CORE_VM_TEST_DESC): PRIVATE_PARAMS+=-Dcts.useEnhancedJunit=true $(CORE_VM_TEST_DESC): PRIVATE_JAVAOPTS:=-Xmx256M # Please see big comment above on why this line depends on javalib.jar instead of classes.jar -$(CORE_VM_TEST_DESC): 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) +$(CORE_VM_TEST_DESC): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INTERMEDIATES)/javalib.jar $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(TESTS_INTERMEDIATES)/javalib.jar $(HOSTTESTLIB_JAR) $(DDMLIB_JAR) $(cts_dir)/all_cts_files_stamp | $(ACP) $(call generate-core-test-description,$(CORE_VM_TEST_DESC),\ cts/tests/vm-tests/AndroidManifest.xml,\ dot.junit.AllJunitHostTests, cts/tools/vm-tests/Android.mk) |