StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make *TS to include NOTICE file by default" am: e4d4188e4f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1471255

Change-Id: I2db691542ecc0b9788cd9daf76e39fd7552ac345
This commit is contained in:
Dan Shi
2020-10-23 16:21:10 +00:00
committed by Automerger Merge Worker
parent 603cd94611 e4d4188e4f
commit 3641172258
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tasks/cts.mk
View File

@@ -16,7 +16,6 @@ test_suite_name := cts
test_suite_tradefed := cts-tradefed test_suite_tradefed := cts-tradefed
test_suite_dynamic_config := cts/tools/cts-tradefed/DynamicConfig.xml test_suite_dynamic_config := cts/tools/cts-tradefed/DynamicConfig.xml
test_suite_readme := cts/tools/cts-tradefed/README test_suite_readme := cts/tools/cts-tradefed/README
include_test_suite_notice := true
include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk

7
core/tasks/tools/compatibility.mk
View File

@@ -79,10 +79,8 @@ $(eval $(call combine-notice-files, html, \
$(HOST_OUT_NOTICE_FILES) $(TARGET_OUT_NOTICE_FILES), \ $(HOST_OUT_NOTICE_FILES) $(TARGET_OUT_NOTICE_FILES), \
$(compatibility_zip_deps))) $(compatibility_zip_deps)))
ifeq ($(include_test_suite_notice),true) compatibility_zip_deps += $(test_suite_notice_txt)
compatibility_zip_deps += $(test_suite_notice_txt) compatibility_zip_resources += $(test_suite_notice_txt)
compatibility_zip_resources += $(test_suite_notice_txt)
endif
compatibility_zip := $(out_dir).zip compatibility_zip := $(out_dir).zip
$(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir) $(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir)
@@ -111,7 +109,6 @@ test_suite_dynamic_config :=
test_suite_readme := test_suite_readme :=
test_suite_prebuilt_tools := test_suite_prebuilt_tools :=
test_suite_tools := test_suite_tools :=
include_test_suite_notice :=
test_suite_jdk := test_suite_jdk :=
test_suite_jdk_dir := test_suite_jdk_dir :=
host_shared_libs := host_shared_libs :=