StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 0f8fcbe2 to gingerbread

Browse Source 
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
This commit is contained in:
Brian Muramatsu
2010-10-07 14:31:21 -07:00
parent d29f5df366 0f8fcbe271
commit cd7170d7ee
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/tasks/cts.mk
View File

@@ -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: 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 # Make necessary directory for CTS
@rm -rf $(PRIVATE_CTS_DIR) @rm -rf $(PRIVATE_CTS_DIR)
@mkdir -p $(TMP_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)/tools
@mkdir -p $(PRIVATE_DIR)/repository/testcases @mkdir -p $(PRIVATE_DIR)/repository/testcases
@mkdir -p $(PRIVATE_DIR)/repository/plans @mkdir -p $(PRIVATE_DIR)/repository/plans
# Copy executable to CTS directory # Copy executable and JARs to CTS directory
$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools $(hide) $(ACP) -fp $(CTS_HOST_JAR) $(CTS_EXECUTABLE_PATH) $(DDMLIB_JAR) $(PRIVATE_JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(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
# Change mode of the executables # Change mode of the executables
$(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH)) $(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH))
$(foreach apk,$(CTS_CASE_LIST), \ $(foreach apk,$(CTS_CASE_LIST), \