diff options
author | tomlu <tomlu@google.com> | 2018-03-20 07:25:33 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-20 07:26:45 -0700 |
commit | 0acc6a7a989949635524424d0c88d7dbf32f38f8 (patch) | |
tree | 37af844ef8ca55c045602aa2e7183e35cce4be18 /src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java | |
parent | 191add5b0e32c39faca09c25e6da6683a79dd8f7 (diff) |
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
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java index 3fe61a32df..cd50c9fc06 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java @@ -91,7 +91,8 @@ public class AndroidCompiledResourceMergingAction { executorService); logger.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); - AndroidResourceOutputs.createClassJar(generatedSources, options.classJarOutput); + AndroidResourceOutputs.createClassJar( + generatedSources, options.classJarOutput, options.targetLabel, options.injectingRuleKind); logger.fine( String.format("Create classJar finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); |