Automated rollback of commit 9d5c323a6e66842cfeb98462cf949dee58710fb8.

*** Reason for rollback ***

Crashes lots of targets in nightly blaze-2018.05.24-1:

PiperOrigin-RevId: 198049395

1 files changed, 6 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java b/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
index a9d4267978..cbb1034924 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
@@ -95,7 +95,6 @@ public class ProcessedAndroidData {
             .setFeatureOf(featureOf)
             .setFeatureAfter(featureAfter);
     return buildActionForBinary(
-        dataContext,
         errorConsumer,
         builder,
         manifest,
@@ -122,7 +121,6 @@ public class ProcessedAndroidData {
             .setApkOut(apkOut);
 
     return buildActionForBinary(
-        dataContext,
         ruleContext,
         builder,
         manifest,
@@ -136,7 +134,6 @@ public class ProcessedAndroidData {
   }
 
   private static ProcessedAndroidData buildActionForBinary(
-      AndroidDataContext dataContext,
       RuleErrorConsumer errorConsumer,
       AndroidResourcesProcessorBuilder builder,
       StampedAndroidManifest manifest,
@@ -162,7 +159,7 @@ public class ProcessedAndroidData {
         .setCrunchPng(crunchPng)
         .withResourceDependencies(resourceDeps)
         .withAssetDependencies(assetDeps)
-        .build(dataContext, resources, assets, manifest);
+        .build(resources, assets, manifest);
   }
 
   /** Processes Android data (assets, resources, and manifest) for android_local_test targets. */
@@ -189,7 +186,7 @@ public class ProcessedAndroidData {
         .setCrunchPng(false)
         .withResourceDependencies(resourceDeps)
         .withAssetDependencies(assetDeps)
-        .build(dataContext, resources, assets, manifest);
+        .build(resources, assets, manifest);
   }
 
   /** Processes Android data (assets, resources, and manifest) for android_test targets. */
@@ -216,7 +213,7 @@ public class ProcessedAndroidData {
             .withResourceDependencies(resourceDeps)
             .withAssetDependencies(assetDeps);
 
-    return builder.build(dataContext, resources, assets, manifest);
+    return builder.build(resources, assets, manifest);
   }
 
   /**
@@ -252,7 +249,7 @@ public class ProcessedAndroidData {
       StampedAndroidManifest manifest,
       String proguardPrefix,
       Map<String, String> manifestValues) {
-    return new AndroidResourcesProcessorBuilder()
+    return new AndroidResourcesProcessorBuilder(dataContext.getRuleContext())
         // Settings
         .setDebug(dataContext.useDebug())
         .setJavaPackage(manifest.getPackage())
@@ -324,12 +321,12 @@ public class ProcessedAndroidData {
    */
   public ResourceApk generateRClass(AndroidDataContext dataContext, AndroidAaptVersion aaptVersion)
       throws InterruptedException {
-    return new RClassGeneratorActionBuilder()
+    return new RClassGeneratorActionBuilder(dataContext.getRuleContext())
         .targetAaptVersion(aaptVersion)
         .withDependencies(resourceDeps)
         .setClassJarOut(
             dataContext.createOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_CLASS_JAR))
-        .build(dataContext, this);
+        .build(this);
   }
 
   /**