tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add additional license dependencies for VTS"

Browse source
This commit is contained in:
Yihan Dong 2022-04-08 01:26:05 +00:00 committed by Gerrit Code Review
commit 6d88026ef5
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/tasks/tools/compatibility.mk
View file

@ -80,6 +80,7 @@ compatibility_zip_deps := \
$(MERGE_ZIPS) \ $(MERGE_ZIPS) \
$(SOONG_ZIP) \ $(SOONG_ZIP) \
$(host_shared_libs) \ $(host_shared_libs) \
$(test_suite_extra_deps) \
compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases $(out_dir)/lib $(out_dir)/lib64 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) rm -f $(PRIVATE_tests_list)
$(call declare-1p-container,$(compatibility_zip),) $(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 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))) $(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 :=
test_suite_jdk_dir := test_suite_jdk_dir :=
host_shared_libs := host_shared_libs :=
test_suite_extra_deps :=

1
core/tasks/tools/vts_package_utils.mk
View file

@ -29,5 +29,6 @@ $(foreach m,$(1),\
$(eval my_copy_dest := $(patsubst data/%,DATA/%,\ $(eval my_copy_dest := $(patsubst data/%,DATA/%,\
$(patsubst system/%,DATA/%,\ $(patsubst system/%,DATA/%,\
$(patsubst $(PRODUCT_OUT)/%,%,$(ins)))))\ $(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)))) $(bui):$(2)/$(my_copy_dest))))
endef endef

4
core/tasks/vts-core-tests.mk
View file

@ -35,14 +35,14 @@ kernel_test_copy_pairs := \
copy_kernel_tests := $(call copy-many-files,$(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 target to be used to build and test `vts_kernel_tests` without building full vts
.PHONY: vts_kernel_tests .PHONY: vts_kernel_tests
vts_kernel_tests: $(copy_kernel_tests) vts_kernel_tests: $(copy_kernel_tests)
include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
$(compatibility_zip): $(copy_kernel_tests)
.PHONY: vts .PHONY: vts
vts: $(compatibility_zip) $(compatibility_tests_list_zip) vts: $(compatibility_zip) $(compatibility_tests_list_zip)
$(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip)) $(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip))