commit 11a97185fc1e574a2fbbc05b0be1a9af2a0372b5
author Googler <noreply@google.com> Thu Jun 27 17:50:27 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 27 17:51:31 2019 -0700
tree d94784103e83ea57c54b9f56209c22809727ea86
parent f67e2c63e8c81731dd454dd911372a9d9397174d

Add a new value for the AndroidManifestMerger enum, FORCE_ANDROID.

RELNOTES: None.
PiperOrigin-RevId: 255514973

src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java

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 7ec6f47..4f09942 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
@@ -158,11 +158,15 @@
   /** Types of android manifest mergers. */
   public enum AndroidManifestMerger {
     LEGACY,
-    ANDROID;
+    ANDROID,
+    FORCE_ANDROID;
 
     public static List<String> getAttributeValues() {
       return ImmutableList.of(
-          LEGACY.name().toLowerCase(), ANDROID.name().toLowerCase(), getRuleAttributeDefault());
+          LEGACY.name().toLowerCase(),
+          ANDROID.name().toLowerCase(),
+          FORCE_ANDROID.name().toLowerCase(),
+          getRuleAttributeDefault());
     }
 
     public static String getRuleAttributeDefault() {

src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java
index fbc9773..409a169 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java
@@ -261,6 +261,10 @@
       RuleErrorConsumer errorConsumer,
       AndroidConfiguration androidConfig,
       @Nullable String mergerString) {
+    if (androidConfig.getManifestMerger() == AndroidManifestMerger.FORCE_ANDROID) {
+      return false;
+    }
+
     AndroidManifestMerger merger = AndroidManifestMerger.fromString(mergerString);
     if (merger == null) {
       merger = androidConfig.getManifestMerger();