diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-11-03 20:27:50 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2016-11-04 09:22:29 +0000 |
| commit | 61c3b1caddf747268940e6ebd1afc4cf33543002 (patch) | |
| tree | 395b688d1da60503334a24663e76f2a22d41fb59 /src | |
| parent | d7cdc550d605fbf015e73802f5deeae3e6a748e7 (diff) | |
Change Bazel default android_manifest_merger to android.
The Firebase Android libraries contain lots of AARs with manifests that include
${applicationId}. As far as I can tell, tools/android/merge_manifests.py only
allows for substitution of ${packageName} and not arbitrary placeholder
substitution. The new aar_import rule exposes the AARs in <sdk>/extras which
include include the Firebase Android libraries.
RELNOTES: Default android_manifest_merger is now "android" which uses the official Android manifest merger. http://tools.android.com/tech-docs/new-build-system/user-guide/manifest-merger
--
MOS_MIGRATED_REVID=138109902
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index c31245df09..d819df0f81 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -364,7 +364,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { public boolean useAndroidResourceShrinking; @Option(name = "android_manifest_merger", - defaultValue = "legacy", + defaultValue = "android", category = "semantics", converter = AndroidManifestMergerConverter.class, help = "Selects the manifest merger to use for android_binary rules. Flag to help the" |