aboutsummaryrefslogtreecommitdiff
path: root/androidmk
diff options
context:
space:
mode:
authorchangho.shin <changho.shin@lge.com>2019-08-08 18:37:17 +0900
committerChangho Shin <changho.shin@lge.com>2019-08-13 08:30:00 +0000
commitb5432b7a3d7656f9f15d9e003da134477ebe5b56 (patch)
treea25d1c3b65d994ab22556b219a7876584d864d89 /androidmk
parent02ed5df4aca361954383c85b3f23c0693f6edc92 (diff)
downloadsoong-b5432b7a3d7656f9f15d9e003da134477ebe5b56.tar.gz
Add 'Additional_manifest' property to merge other manifests
This is equivalent to 'LOCAL_FULL_LIBS_MANIFEST_FILES' in Make. Fixes: 123374442 Test: m -j Change-Id: Ic4b40a08f2454687c74949020598651acea3b2dd
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/android.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 2def179af..fcadd0359 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -173,6 +173,8 @@ func init() {
// Jacoco filters:
"LOCAL_JACK_COVERAGE_INCLUDE_FILTER": "jacoco.include_filter",
"LOCAL_JACK_COVERAGE_EXCLUDE_FILTER": "jacoco.exclude_filter",
+
+ "LOCAL_FULL_LIBS_MANIFEST_FILES": "additional_manifests",
})
addStandardProperties(bpparser.BoolType,