aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorchangho.shin <changho.shin@lge.com>2019-08-08 18:37:17 +0900
committerMichael Bestas <mkbestas@lineageos.org>2019-12-11 19:03:32 +0200
commitc56ab05e72df96743b8911808227892e58b4f3bd (patch)
tree975449c9532ac99966ebfb13cc0bd74d6c5f8693 /androidmk
parentf97beb5bfc36a76c752b078cf42c7283580eb6ef (diff)
downloadbuild_soong-c56ab05e72df96743b8911808227892e58b4f3bd.tar.gz
build_soong-c56ab05e72df96743b8911808227892e58b4f3bd.tar.bz2
build_soong-c56ab05e72df96743b8911808227892e58b4f3bd.zip
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 52bcf9c9..e3c5b93a 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -169,6 +169,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,