summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2019-05-29 18:28:22 +0900
committer Jooyung Han <jooyung@google.com> 2019-06-01 09:57:28 +0900
commit4416b009e1ef849c8891c57f57592f6158a89fbf (patch)
treefd8d12f19e04def99138dfe0a60e756e2581e143
parent3134681218449507325aa55c3601ed432f722ca0 (diff)
Ignore testcases' NOTICE files
$(BUILD_NATIVE_TEST) will install a test binary into /testcases regardless of is proprietary or not. For now, since NOTICE.xml for a system partition depends on all modules in /testcases, "m systemimage" may trigger "installing a proprietary test". Modules in /testcase are not actually installed, so we can ignore them when we make a notice file. Bug: 133454731 Test: (internal) m systemimage, and see /vendor/lib if there are unexpected files installed. Change-Id: I54ee51a761049b8a5ce9e3369b30b7ade6344146
-rw-r--r--core/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index a4825e1d5a..a9224a235a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1145,6 +1145,8 @@ installed_product_services_notice_xml_gz := $(TARGET_OUT_PRODUCT_SERVICES)/etc/N
license_modules := $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file) $(pdk_fusion_notice_files)
# Phonys/fakes don't have notice files (though their deps might)
license_modules := $(filter-out $(TARGET_OUT_FAKE)/%,$(license_modules))
+# testcases are not relevant to the system image.
+license_modules := $(filter-out $(TARGET_OUT_TESTCASES)/%,$(license_modules))
license_modules_vendor := $(filter $(TARGET_OUT_VENDOR)/%,$(license_modules))
license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules))
license_modules_product_services := $(filter $(TARGET_OUT_PRODUCT_SERVICES)/%,$(license_modules))