aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-19 01:23:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-19 01:23:26 +0000
commit22f98f1885848fc3ba7afbefbb6f244e7aa90352 (patch)
tree5e34131f90c4f1dba4ae91bb47246a2d8016c6c5
parentaec1debc6586c0a5382b7f915e7f6b22af9c2df4 (diff)
parent9917520fc23aef00fc1298cc9fee06e694973263 (diff)
downloadbuild_make-22f98f1885848fc3ba7afbefbb6f244e7aa90352.tar.gz
build_make-22f98f1885848fc3ba7afbefbb6f244e7aa90352.tar.bz2
build_make-22f98f1885848fc3ba7afbefbb6f244e7aa90352.zip
Merge "notice files in system_other becomes included in system's one" into rvc-dev
-rw-r--r--core/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index a36ea223f4..4d4021d1e4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1479,6 +1479,8 @@ 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_system := $(filter $(TARGET_OUT)/%,$(license_modules))
+# system_other is relevant to system partition.
+license_modules_system += $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(license_modules))
license_modules_vendor := $(filter $(TARGET_OUT_VENDOR)/%,$(license_modules))
license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules))
license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modules))