diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-11-02 17:12:17 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2016-11-02 17:27:55 +0000 |
| commit | 2d431b4a80cb702a6538864db762e0956251c0a4 (patch) | |
| tree | 191a2f7e55c94c232fb1c9bbd5b6a5bdffc8dd25 | |
| parent | ed5be4500687264ac1e84d5c17f4c5e6f33f2d69 (diff) | |
Rollback of commit 0c6e4cdab3c38f8751fb3b944ccaa53866e4c032.
*** Reason for rollback ***
Broke internal builds.
--
MOS_MIGRATED_REVID=137959459
| -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 ae48e5dd6d..c3bffb5137 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 = "android", + defaultValue = "legacy", category = "semantics", converter = AndroidManifestMergerConverter.class, help = "Selects the manifest merger to use for android_binary rules. Flag to help the" |