diff options
| author | wangzhou <wangzhou@google.com> | 2020-07-15 07:49:26 -0700 |
|---|---|---|
| committer | Joe Zhou Wang <wangzhou@google.com> | 2020-09-24 16:47:50 +0000 |
| commit | c556296ec8c7873f133b83c5e0ba770d79b6d030 (patch) | |
| tree | cce8595e4f4b60cb05d5797f253f0f8586fd258d | |
| parent | e19f116d38497f22736f4e25e0a3906b2e1af593 (diff) | |
| download | build-c556296ec8c7873f133b83c5e0ba770d79b6d030.tar.gz | |
Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"
Test: $ make cts && unzip -l \
out/host/linux-x86/cts/android-cts.zip \
| grep NOTICE
$ make pts && \ unzip -l \
out/host/linux-x86/cts/android-cts.zip \
| grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
Merged-In: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad752dc0d828b52efeebfc3b74512e72)
| -rw-r--r-- | core/tasks/cts.mk | 1 | ||||
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 33c3a836f0..f1f7a49eff 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -17,6 +17,7 @@ test_suite_tradefed := cts-tradefed # TODO: Fix the following two lines after harness is moved to its own repo test_suite_dynamic_config := test/suite_harness/tools/cts-tradefed/DynamicConfig.xml test_suite_readme := test/suite_harness/tools/cts-tradefed/README +test_suite_notice := $(tools_notice_file_txt) include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 3d1d783e33..625a0cadc4 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -43,19 +43,29 @@ test_tools := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar \ test_tools += $(test_suite_tools) +compatibility_zip_deps := $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tools) $(test_suite_dynamic_config) $(SOONG_ZIP) +compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases +ifdef test_suite_notice + compatibility_zip_deps += $(test_suite_notice) + compatibility_zip_resources += $(out_dir)/$(notdir $(test_suite_notice)) +endif + compatibility_zip := $(out_dir).zip $(compatibility_zip): PRIVATE_NAME := android-$(test_suite_name) $(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir) $(compatibility_zip): PRIVATE_TOOLS := $(test_tools) $(test_suite_prebuilt_tools) $(compatibility_zip): PRIVATE_SUITE_NAME := $(test_suite_name) $(compatibility_zip): PRIVATE_DYNAMIC_CONFIG := $(test_suite_dynamic_config) -$(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tools) $(test_suite_dynamic_config) $(SOONG_ZIP) | $(ADB) $(ACP) +$(compatibility_zip): PRIVATE_NOTICE := $(test_suite_notice) +$(compatibility_zip): PRIVATE_RESOURCES := $(compatibility_zip_resources) +$(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) # Make dir structure $(hide) mkdir -p $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases # Copy tools $(hide) $(ACP) -fp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) $(ACP) -fp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic) - $(hide) find $(dir $@)/$(PRIVATE_NAME) | sort >$@.list + $(if $(PRIVATE_NOTICE),$(hide) $(ACP) -fp $(PRIVATE_NOTICE) $(PRIVATE_OUT_DIR)) + $(hide) find $(PRIVATE_RESOURCES) | sort >$@.list $(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@) -l $@.list # Reset all input variables @@ -65,3 +75,4 @@ test_suite_dynamic_config := test_suite_readme := test_suite_prebuilt_tools := test_suite_tools := +test_suite_notice := |