Make --experimental_use_parallel_android_resource_processing a no-op.

Also, a few small cleanups of some duplicate test methods.

RELNOTES: None
PiperOrigin-RevId: 163066349

3 files changed, 6 insertions, 15 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 4e0e9b67f0..e34d0d3d03 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
@@ -570,6 +570,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     @Option(
       name = "experimental_use_parallel_android_resource_processing",
       defaultValue = "true",
+      deprecationWarning =
+          "This flag is deprecated and is a no-op. It will be removed in a future release.",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =
@@ -748,7 +750,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final boolean useRexToCompressDexFiles;
   private final boolean allowAndroidLibraryDepsWithoutSrcs;
   private final boolean useAndroidResourceShrinking;
-  private final boolean useParallelResourceProcessing;
   private final AndroidManifestMerger manifestMerger;
   private final ApkSigningMethod apkSigningMethod;
   private final boolean useSingleJarApkBuilder;
@@ -784,7 +785,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.allowAndroidLibraryDepsWithoutSrcs = options.allowAndroidLibraryDepsWithoutSrcs;
     this.useAndroidResourceShrinking = options.useAndroidResourceShrinking
         || options.useExperimentalAndroidResourceShrinking;
-    this.useParallelResourceProcessing = options.useParallelResourceProcessing;
     this.manifestMerger = options.manifestMerger;
     this.apkSigningMethod = options.apkSigningMethod;
     this.useSingleJarApkBuilder = options.useSingleJarApkBuilder;
@@ -878,10 +878,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return useAndroidResourceShrinking;
   }
 
-  public boolean useParallelResourceProcessing() {
-    return useParallelResourceProcessing;
-  }
-
   public AndroidAaptVersion getAndroidAaptVersion() {
     return androidAaptVersion;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 5e5454200b..e4d492b473 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -94,7 +94,6 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
       resourceApk =
           applicationManifest.packLibraryWithDataAndResources(
               ruleContext,
-              null /* resourceApk, optional */,
               ResourceDependencies.fromRuleDeps(ruleContext, JavaCommon.isNeverLink(ruleContext)),
               ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_R_TXT),
               ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_MERGED_SYMBOLS),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
index 0fea1e2567..ecc18479d7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
@@ -307,7 +307,6 @@ public final class ApplicationManifest {
       Artifact resourceApk,
       RuleContext ruleContext,
       ResourceDependencies resourceDeps,
-      Artifact rTxt,
       boolean incremental,
       Artifact proguardCfg) throws InterruptedException, RuleErrorException {
     LocalResourceContainer data = new LocalResourceContainer.Builder(ruleContext)
@@ -323,12 +322,10 @@ public final class ApplicationManifest {
         ruleContext,
         false, /* isLibrary */
         resourceDeps,
-        ImmutableList.<String>of(), /* uncompressedExtensions */
+        ImmutableList.of(), /* uncompressedExtensions */
         true, /* crunchPng */
         incremental,
-        ResourceContainer.builderFromRule(ruleContext)
-            .setRTxt(rTxt)
-            .setApk(resourceApk),
+        ResourceContainer.builderFromRule(ruleContext).setApk(resourceApk),
         data,
         proguardCfg,
         null, /* Artifact mainDexProguardCfg */
@@ -481,7 +478,6 @@ public final class ApplicationManifest {
 
   public ResourceApk packLibraryWithDataAndResources(
       RuleContext ruleContext,
-      @Nullable Artifact resourceApk,
       ResourceDependencies resourceDeps,
       Artifact rTxt,
       Artifact symbols,
@@ -528,7 +524,7 @@ public final class ApplicationManifest {
         ruleContext,
         true /* isLibrary */,
         resourceDeps,
-        ImmutableList.<String>of() /* uncompressedExtensions */,
+        ImmutableList.of() /* uncompressedExtensions */,
         false /* crunchPng */,
         false /* incremental */,
         builder,
@@ -583,7 +579,7 @@ public final class ApplicationManifest {
     }
 
     ResourceContainer processed;
-    if (isLibrary && AndroidCommon.getAndroidConfig(ruleContext).useParallelResourceProcessing()) {
+    if (isLibrary) {
       // android_library should only build the APK one way (!incremental).
       Preconditions.checkArgument(!incremental);
       Artifact rJavaClassJar = ruleContext.getImplicitOutputArtifact(