Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17412c83 authored by dcashman's avatar dcashman
Browse files

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
parent 69b20474

core/tasks/cts.mk

+6 −2
Original line number Diff line number Diff line
@@ -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)))