diff options
| author | Brian Muramatsu <btmura@google.com> | 2010-10-07 14:31:21 -0700 |
|---|---|---|
| committer | Brian Muramatsu <btmura@google.com> | 2010-10-07 14:31:21 -0700 |
| commit | cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959 (patch) | |
| tree | b2c6ff8950fc96c458972d33aee7cf80d33ad31b | |
| parent | d29f5df3663acb01f88347b67056d969e2d49d15 (diff) | |
| parent | 0f8fcbe271cad06cb21e0c4602baf35758f4adb1 (diff) | |
| download | build-cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959.zip build-cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959.tar.gz build-cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959.tar.bz2 | |
resolved conflicts for merge of 0f8fcbe2 to gingerbread
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
| -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 f697347..8e22552 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -45,7 +45,8 @@ DEFAULT_TEST_PLAN := $(PRIVATE_DIR)/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), \ |