Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d4188e authored Oct 23, 2020 by Dan Shi Committed by Gerrit Code Review Oct 23, 2020

Merge "Make *TS to include NOTICE file by default"

parents 48d34d8a 413a5306

core/tasks/cts.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ test_suite_name := cts
		test_suite_tradefed := cts-tradefed
		test_suite_dynamic_config := cts/tools/cts-tradefed/DynamicConfig.xml
		test_suite_readme := cts/tools/cts-tradefed/README
		include_test_suite_notice := true

		include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk

core/tasks/tools/compatibility.mk

+2 −5

Original line number	Diff line number	Diff line
		@@ -79,10 +79,8 @@ $(eval $(call combine-notice-files, html, \
		$(HOST_OUT_NOTICE_FILES) $(TARGET_OUT_NOTICE_FILES), \
		$(compatibility_zip_deps)))

		ifeq ($(include_test_suite_notice),true)
		compatibility_zip_deps += $(test_suite_notice_txt)
		compatibility_zip_resources += $(test_suite_notice_txt)
		endif

		compatibility_zip := $(out_dir).zip
		$(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir)
		@@ -111,7 +109,6 @@ test_suite_dynamic_config :=
		test_suite_readme :=
		test_suite_prebuilt_tools :=
		test_suite_tools :=
		include_test_suite_notice :=
		test_suite_jdk :=
		test_suite_jdk_dir :=
		host_shared_libs :=