diff options
| author | dcashman <dcashman@google.com> | 2015-04-21 11:25:28 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2015-04-21 17:53:21 -0700 |
| commit | 17412c83054938c3b56e968ab3054594856f121e (patch) | |
| tree | ffc307a5ec7d091646f1ed82bf05374c607ec88c | |
| parent | 69b20474d578ea6313570c29526fc0854a920946 (diff) | |
| download | build-17412c83054938c3b56e968ab3054594856f121e.zip build-17412c83054938c3b56e968ab3054594856f121e.tar.gz build-17412c83054938c3b56e968ab3054594856f121e.tar.bz2 | |
Add lib dirs to cts distribution.
Add ability to include dirs to the cts distribtion to enable bundling of shared
libraries on which host-side executables rely.
Bug: 19566396
Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
| -rw-r--r-- | core/tasks/cts.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index ee17444..23648f8 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -65,7 +65,7 @@ CTS_CORE_CASE_LIST += \ CTS_TEST_JAR_LIST := \ cts-junit \ - CtsJdwp + CtsJdwp # Depend on the full package paths rather than the phony targets to avoid # rebuilding the packages every time. @@ -86,8 +86,11 @@ $(foreach m, $(CTS_CASE_LIST),\ $(eval $(call copy-one-file, $(built), $(installed)))\ $(eval CTS_CASE_LIST_APKS += $(installed)))) +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_CASES) $(CTS_CASE_LIST_APKS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) $(CTS_TEST_JAR_FILES) +$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) $(CTS_TEST_JAR_FILES) $(CTS_SHARED_LIBS) # Make necessary directory for CTS $(hide) mkdir -p $(TMP_DIR) $(hide) mkdir -p $(PRIVATE_DIR)/docs @@ -97,6 +100,7 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_CASE_L # Copy executable and JARs to CTS directory $(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(PRIVATE_DIR)/repository/testcases $(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(PRIVATE_DIR)/tools + $(hide) $(call copy-files-with-structure, $(CTS_SHARED_LIBS),$(HOST_OUT)/,$(PRIVATE_DIR)) # Change mode of the executables $(foreach jar,$(CTS_TEST_JAR_LIST),$(call copy-testcase-jar,$(jar))) $(foreach testcase,$(CTS_TEST_CASES),$(call copy-testcase,$(testcase))) |