summaryrefslogtreecommitdiff
path: root/java/config/makevars.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-06-07 16:46:02 -0700
committer Colin Cross <ccross@android.com> 2018-06-14 14:54:27 -0700
commit8bb10e8f8a72e6f6e87e9812dacb3816a37c7ed5 (patch)
tree570aa4b252af44fb85ce7131be5895a6bc2f790b /java/config/makevars.go
parent30485c920c64880856c58bc33e2b45109a13c004 (diff)
Add a script to inject values into manifests
Add a script that can inject a <uses-sdk minSdkVersion=""> into AndroidManifest.xml files. This will help with merging LOCAL_STATIC_ANDROID_LIBRARIES, because ManifestMerger treats a missing minSdkVersion as minSdkVersion=1 and throws errors if libraries use a larger minSdkVersion. It will also help with cases where an app has a manifest that specifies an old minSdkVersion, but the build system is compiling the app in a way that is not compatibile with old devices, for example using a newer dex format. Bug: 110167203 Test: m java Test: build/soong/scripts/manifest_fixer_test.py Change-Id: I528d71a225feb86464c530e11b223babb0ea9edf
Diffstat (limited to 'java/config/makevars.go')
-rw-r--r--java/config/makevars.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/config/makevars.go b/java/config/makevars.go
index 4dffa0246..0e6227422 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -72,4 +72,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("DEFAULT_JACOCO_EXCLUDE_FILTER", strings.Join(DefaultJacocoExcludeFilter, ","))
ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}")
+
+ ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}")
}