Have the Android R class generators add the target label to the class jar.

This re-enables support for add_deps.

RELNOTES: None
PiperOrigin-RevId: 189737607

4 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
index 48c5cf989e..65afc20314 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
@@ -240,7 +240,7 @@ public class AndroidResourceMergingActionBuilder {
             .build(context));
   }
 
-  public ResourceContainer build(ActionConstructionContext context) {
+  public ResourceContainer build(RuleContext context) {
     CustomCommandLine.Builder parsedMergeBuilder =
         new CustomCommandLine.Builder().add("--tool").add("MERGE").add("--");
     CustomCommandLine.Builder compiledMergeBuilder =
@@ -267,6 +267,7 @@ public class AndroidResourceMergingActionBuilder {
 
     if (classJarOut != null) {
       jarAndManifestBuilder.addExecPath("--classJarOutput", classJarOut);
+      jarAndManifestBuilder.addLabel("--targetLabel", ruleContext.getLabel());
       jarAndManifestOutputs.add(classJarOut);
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/LibraryRGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/LibraryRGeneratorActionBuilder.java
index 36851bf144..14dfa203f9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/LibraryRGeneratorActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/LibraryRGeneratorActionBuilder.java
@@ -82,6 +82,7 @@ public class LibraryRGeneratorActionBuilder {
     }
 
     builder.addExecPath("--classJarOutput", rJavaClassJar);
+    builder.addLabel("--targetLabel", ruleContext.getLabel());
 
     builder.addExecPath("--androidJar", sdk.getAndroidJar());
     inputs.add(sdk.getAndroidJar());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
index 178c7e99ac..c4f1559998 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
@@ -113,6 +113,7 @@ public class RClassGeneratorActionBuilder {
     }
     builder.addExecPath("--classJarOutput", classJarOut);
     outs.add(classJarOut);
+    builder.addLabel("--targetLabel", ruleContext.getLabel());
 
     // Create the spawn action.
     SpawnAction.Builder spawnActionBuilder = new SpawnAction.Builder();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java
index 5b66d53a58..6617ddc57b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java
@@ -118,6 +118,8 @@ public class RobolectricResourceSymbolsActionBuilder {
         .addTransitive(dependencies.getTransitiveSymbolsBin());
 
     builder.addExecPath("--classJarOutput", classJarOut);
+    builder.addLabel("--targetLabel", ruleContext.getLabel());
+
     SpawnAction.Builder spawnActionBuilder = new SpawnAction.Builder();
 
     ParamFileInfo.Builder paramFile = ParamFileInfo.builder(ParameterFileType.SHELL_QUOTED);