Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib. Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
This commit is contained in:
@@ -25,6 +25,7 @@ else
|
|||||||
endif
|
endif
|
||||||
CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar
|
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
|
junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar
|
||||||
HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar
|
HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar
|
||||||
|
|
||||||
@@ -117,6 +118,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB
|
|||||||
# Copy executable to CTS directory
|
# Copy executable to CTS directory
|
||||||
$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools
|
$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools
|
||||||
$(hide) $(ACP) -fp $(CTS_EXECUTABLE_PATH) $(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
|
# Copy junit jar
|
||||||
$(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools
|
$(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools
|
||||||
# Copy hosttestlib jar
|
# Copy hosttestlib jar
|
||||||
|
Reference in New Issue
Block a user