From 2daa77ee0140da66d14388cbc7f6189e9a1e1f8e Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 28 Jul 2010 11:07:31 -0700 Subject: [PATCH] Package ddmlib-prebuilt with CTS. This ensures that CTS is using a compatible ddmlib. --- core/tasks/cts.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 0a796f0a6..f697347c4 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -25,6 +25,7 @@ else endif CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar +DDMLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/ddmlib-prebuilt.jar junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar @@ -55,6 +56,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB # Copy executable to CTS directory $(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools $(hide) $(ACP) -fp $(CTS_EXECUTABLE_PATH) $(PRIVATE_DIR)/tools +# Copy ddmlib prebuilt jar + $(hide) $(ACP) -fp $(DDMLIB_JAR) $(PRIVATE_DIR)/tools # Copy junit jar $(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools # Copy hosttestlib jar -- 2.11.0