Merge "Support generating VTS file metadata" into main (d1d709cd) · Commits · e / os / android_build

core/tasks/cts.mk

+2 −16

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ $(call declare-1p-target,$(test_suite_readme),cts)
		include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk

		.PHONY: cts
		cts: $(compatibility_zip) $(compatibility_tests_list_zip)
		$(call dist-for-goals, cts, $(compatibility_zip) $(compatibility_tests_list_zip))
		cts: $(compatibility_zip) $(compatibility_tests_list_zip) $(compatibility_files_metadata)
		$(call dist-for-goals, cts, $(compatibility_zip) $(compatibility_tests_list_zip) $(compatibility_files_metadata))

		.PHONY: cts_v2
		cts_v2: cts
		@@ -101,20 +101,6 @@ $(verifier-zip): $(SOONG_ANDROID_CTS_VERIFIER_ZIP) $(cts-v-host-zip) $(SOONG_ZIP
		endif
		$(call dist-for-goals, cts, $(verifier-zip))

		cts_files_metadata := $(HOST_OUT)/cts/cts_files_metadata.textproto
		file_metadata_generation_tool := $(HOST_OUT_EXECUTABLES)/file_metadata_generation$(HOST_EXECUTABLE_SUFFIX)
		aapt2_tool := $(HOST_OUT_EXECUTABLES)/aapt2$(HOST_EXECUTABLE_SUFFIX)
		$(cts_files_metadata): PRIVATE_TESTCASES_DIR := $(HOST_OUT)/cts/android-cts/testcases
		$(cts_files_metadata): PRIVATE_AAPT2_TOOL := $(aapt2_tool)
		$(cts_files_metadata): PRIVATE_METADATA_TOOL := $(file_metadata_generation_tool)
		$(cts_files_metadata): PRIVATE_SDK_VERSION := $(PLATFORM_SDK_VERSION)
		$(cts_files_metadata): $(file_metadata_generation_tool) $(aapt2_tool) $(compatibility_zip)
		$(PRIVATE_METADATA_TOOL) --testcases_dir $(PRIVATE_TESTCASES_DIR)\
		--aapt2 $(PRIVATE_AAPT2_TOOL) --sdk_version $(PRIVATE_SDK_VERSION) --output $@

		ALL_TARGETS.$(cts_files_metadata).META_LIC:=$(module_license_metadata)
		$(call dist-for-goals, cts, $(cts_files_metadata))

		# For producing CTS coverage reports.
		# Run "make cts-test-coverage" in the $ANDROID_BUILD_TOP directory.

core/tasks/tools/compatibility.mk

+13 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,19 @@ $(call declare-0p-target,$(test_suite_notice_txt))
		$(call declare-1p-copy-files,$(test_suite_dynamic_config),)
		$(call declare-1p-copy-files,$(test_suite_prebuilt_tools),)

		compatibility_files_metadata := $(HOST_OUT)/$(test_suite_name)/$(test_suite_name)_files_metadata.textproto
		file_metadata_generation_tool := $(HOST_OUT_EXECUTABLES)/file_metadata_generation$(HOST_EXECUTABLE_SUFFIX)
		aapt2_tool := $(HOST_OUT_EXECUTABLES)/aapt2$(HOST_EXECUTABLE_SUFFIX)
		$(compatibility_files_metadata): PRIVATE_TESTCASES_DIR := $(out_dir)/testcases
		$(compatibility_files_metadata): PRIVATE_AAPT2_TOOL := $(aapt2_tool)
		$(compatibility_files_metadata): PRIVATE_METADATA_TOOL := $(file_metadata_generation_tool)
		$(compatibility_files_metadata): PRIVATE_SDK_VERSION := $(PLATFORM_SDK_VERSION)
		$(compatibility_files_metadata): $(file_metadata_generation_tool) $(aapt2_tool) $(compatibility_zip)
		$(PRIVATE_METADATA_TOOL) --testcases_dir $(PRIVATE_TESTCASES_DIR)\
		--aapt2 $(PRIVATE_AAPT2_TOOL) --sdk_version $(PRIVATE_SDK_VERSION) --output $@

		$(call declare-0p-target,$(compatibility_files_metadata),)

		# Reset all input variables
		test_suite_name :=
		test_suite_tradefed :=

core/tasks/vts-core-tests.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ test_suite_readme := test/vts/tools/vts-core-tradefed/README
		include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk

		.PHONY: vts
		vts: $(compatibility_zip) $(compatibility_tests_list_zip)
		$(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip))
		vts: $(compatibility_zip) $(compatibility_tests_list_zip) $(compatibility_files_metadata)
		$(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip) $(compatibility_files_metadata))

		tests: vts