diff options
| author | dcashman <dcashman@google.com> | 2015-04-22 14:49:23 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2015-04-22 14:49:23 -0700 |
| commit | 9d50b548cdbd1e98f9b68ca256d63f03ae9dd3ce (patch) | |
| tree | 254e3db8cfd8f6f4dc5329e38da2ea1620e5e28a /core/tasks | |
| parent | 75050017066d00adb03ce2f7c98695f3cda8376e (diff) | |
| parent | b9e4848ef5985f28013d0491281f6b1db9a0713f (diff) | |
| download | build-9d50b548cdbd1e98f9b68ca256d63f03ae9dd3ce.tar.gz build-9d50b548cdbd1e98f9b68ca256d63f03ae9dd3ce.tar.bz2 build-9d50b548cdbd1e98f9b68ca256d63f03ae9dd3ce.zip | |
resolved conflicts for merge of b9e4848e to master
Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/cts.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index acaaa296c..668d5bbf4 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -92,8 +92,11 @@ CTS_CASE_LIST_JARS := $(foreach m, $(CTS_TEST_JAR_LIST),\ $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar)) +CTS_SHARED_LIBS := \ + $(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX) + DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans -$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP) +$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP) $(CTS_SHARED_LIBS) # Make necessary directory for CTS $(hide) mkdir -p $(TMP_DIR) @@ -104,6 +107,7 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TE # Copy executable and JARs to CTS directory $(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(CTS_TESTCASES_OUT) $(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(ADDITIONAL_TF_JARS) $(CTS_TF_README_PATH) $(PRIVATE_DIR)/tools + $(hide) $(call copy-files-with-structure, $(CTS_SHARED_LIBS),$(HOST_OUT)/,$(PRIVATE_DIR)) $(hide) touch $@ # Generate the test descriptions for the core-tests |