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

Commit 0ae8bf67 authored by dcashman's avatar dcashman Committed by Android Git Automerger
Browse files

am 780bdd6a: am ab59266d: Merge "Add lib dirs to cts distribution." 

* commit '780bdd6a':
  Add lib dirs to cts distribution.
parents 6cb3732d 780bdd6a

core/tasks/cts.mk

+6 −2
Original line number Original line Diff line number Diff line
@@ -86,8 +86,11 @@ $(foreach m, $(CTS_CASE_LIST),\ 
    $(eval $(call copy-one-file, $(built), $(installed)))\

    $(eval $(call copy-one-file, $(built), $(installed)))\

    $(eval CTS_CASE_LIST_APKS += $(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

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

# Make necessary directory for CTS

	$(hide) mkdir -p $(TMP_DIR)

	$(hide) mkdir -p $(TMP_DIR)

	$(hide) mkdir -p $(PRIVATE_DIR)/docs

	$(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

# Copy executable and JARs to CTS directory

	$(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(PRIVATE_DIR)/repository/testcases

	$(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) $(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

# Change mode of the executables

	$(foreach jar,$(CTS_TEST_JAR_LIST),$(call copy-testcase-jar,$(jar)))

	$(foreach jar,$(CTS_TEST_JAR_LIST),$(call copy-testcase-jar,$(jar)))

	$(foreach testcase,$(CTS_TEST_CASES),$(call copy-testcase,$(testcase)))

	$(foreach testcase,$(CTS_TEST_CASES),$(call copy-testcase,$(testcase)))