--

MOS_MIGRATED_REVID=127091947

1 files changed, 2 insertions, 7 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 bcb7792a7d..eab678210c 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
@@ -324,10 +324,11 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
         help = "Enables resource shrinking for android_binary APKs that use proguard.")
     public boolean useAndroidResourceShrinking;
 
+    // TODO(jimbrooks): Remove this flag after it is removed from the global blazerc.
     @Option(name = "experimental_use_proguard_previous_obfuscation_map",
         defaultValue = "false",
         category = "undocumented",
-        help = "Enables the use of an obfuscation map when generating the main dex jar file")
+        help = "Does nothing (obsolete).")
     public boolean useProguardPreviousObfuscationMap;
 
     @Option(name = "android_manifest_merger",
@@ -416,7 +417,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final ImmutableList<String> targetDexoptsThatPreventIncrementalDexing;
   private final boolean allowAndroidLibraryDepsWithoutSrcs;
   private final boolean useAndroidResourceShrinking;
-  private final boolean useProguardPreviousObfuscationMap;
   private final boolean useRClassGenerator;
   private final AndroidManifestMerger manifestMerger;
 
@@ -441,7 +441,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
         ImmutableList.copyOf(options.nonIncrementalPerTargetDexopts);
     this.allowAndroidLibraryDepsWithoutSrcs = options.allowAndroidLibraryDepsWithoutSrcs;
     this.useAndroidResourceShrinking = options.useAndroidResourceShrinking;
-    this.useProguardPreviousObfuscationMap = options.useProguardPreviousObfuscationMap;
     this.useRClassGenerator = options.useRClassGenerator;
     this.manifestMerger = options.manifestMerger;
   }
@@ -516,10 +515,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return useAndroidResourceShrinking;
   }
 
-  public boolean useProguardPreviousObfuscationMap() {
-    return useProguardPreviousObfuscationMap;
-  }
-
   public boolean useRClassGenerator() {
     return useRClassGenerator;
   }