From e45ff68740e3392d1d3dad11068037a2abea4bde Mon Sep 17 00:00:00 2001 From: Yihan Dong Date: Fri, 25 Mar 2022 13:57:05 +0800 Subject: [PATCH] Add additional license dependencies for VTS Bug: 213388645 Test: m vts Change-Id: I5f0b35b5ec943f5628f118bf0812391047b49708 --- core/tasks/tools/compatibility.mk | 4 +++- core/tasks/tools/vts_package_utils.mk | 1 + core/tasks/vts-core-tests.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 3b348bd059..a7910aecaa 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -80,6 +80,7 @@ compatibility_zip_deps := \ $(MERGE_ZIPS) \ $(SOONG_ZIP) \ $(host_shared_libs) \ + $(test_suite_extra_deps) \ compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases $(out_dir)/lib $(out_dir)/lib64 @@ -121,7 +122,7 @@ $(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) rm -f $(PRIVATE_tests_list) $(call declare-1p-container,$(compatibility_zip),) -$(call declare-container-license-deps,$(compatibility_zip),$(compatibility_zip_deps) $(test_suite_jdk),$(out_dir)/:/) +$(call declare-container-license-deps,$(compatibility_zip),$(compatibility_zip_deps) $(test_suite_jdk), $(out_dir)/:/) $(eval $(call html-notice-rule,$(test_suite_notice_html),"Test suites","Notices for files contained in the test suites filesystem image:",$(compatibility_zip),$(compatibility_zip))) $(eval $(call text-notice-rule,$(test_suite_notice_txt),"Test suites","Notices for files contained in the test suites filesystem image:",$(compatibility_zip),$(compatibility_zip))) @@ -139,3 +140,4 @@ test_suite_tools := test_suite_jdk := test_suite_jdk_dir := host_shared_libs := +test_suite_extra_deps := diff --git a/core/tasks/tools/vts_package_utils.mk b/core/tasks/tools/vts_package_utils.mk index 47bf29cf08..f1159b3bd9 100644 --- a/core/tasks/tools/vts_package_utils.mk +++ b/core/tasks/tools/vts_package_utils.mk @@ -29,5 +29,6 @@ $(foreach m,$(1),\ $(eval my_copy_dest := $(patsubst data/%,DATA/%,\ $(patsubst system/%,DATA/%,\ $(patsubst $(PRODUCT_OUT)/%,%,$(ins)))))\ + $(eval ALL_TARGETS.$(2)/$(my_copy_dest).META_LIC := $(if $(strip $(ALL_MODULES.$(m).META_LIC)),$(ALL_MODULES.$(m).META_LIC),$(ALL_MODULES.$(m).DELAYED_META_LIC)))\ $(bui):$(2)/$(my_copy_dest)))) endef diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index 3c838b5695..befde87099 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -35,14 +35,14 @@ kernel_test_copy_pairs := \ copy_kernel_tests := $(call copy-many-files,$(kernel_test_copy_pairs)) +test_suite_extra_deps := $(copy_kernel_tests) + # PHONY target to be used to build and test `vts_kernel_tests` without building full vts .PHONY: vts_kernel_tests vts_kernel_tests: $(copy_kernel_tests) include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk -$(compatibility_zip): $(copy_kernel_tests) - .PHONY: vts vts: $(compatibility_zip) $(compatibility_tests_list_zip) $(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip))