diff options
| author | Brian Muramatsu <btmura@google.com> | 2010-10-10 12:51:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 12:51:28 -0700 |
| commit | 0dd458e65ab537a7a961e54257dcb77628ec3789 (patch) | |
| tree | a03292d524eaffce6cddcc9a9282c3a0e3c38f72 /core/tasks | |
| parent | eef1d7d422ac85a8b4de9a9ef1415c8537f33406 (diff) | |
| parent | 99185c2a462d563855e4bc0c1e5649a21b2e186b (diff) | |
| download | build-0dd458e65ab537a7a961e54257dcb77628ec3789.zip build-0dd458e65ab537a7a961e54257dcb77628ec3789.tar.gz build-0dd458e65ab537a7a961e54257dcb77628ec3789.tar.bz2 | |
am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread
Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'
* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
Support Additional CTS Host Jars
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/cts.mk | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 9834404..cacbcb3 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -45,7 +45,8 @@ DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans $(cts_dir)/all_cts_files_stamp: PRIVATE_JUNIT_HOST_JAR := $(junit_host_jar) -$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(ACP) +-include cts/CtsHostLibraryList.mk +$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(ACP) # Make necessary directory for CTS @rm -rf $(PRIVATE_CTS_DIR) @mkdir -p $(TMP_DIR) @@ -53,15 +54,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB @mkdir -p $(PRIVATE_DIR)/tools @mkdir -p $(PRIVATE_DIR)/repository/testcases @mkdir -p $(PRIVATE_DIR)/repository/plans -# 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 - $(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(PRIVATE_DIR)/tools +# Copy executable and JARs to CTS directory + $(hide) $(ACP) -fp $(CTS_HOST_JAR) $(CTS_EXECUTABLE_PATH) $(DDMLIB_JAR) $(PRIVATE_JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(PRIVATE_DIR)/tools # Change mode of the executables $(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH)) $(foreach apk,$(CTS_CASE_LIST), \ |