diff options
author | 2016-08-29 21:18:21 +0000 | |
---|---|---|
committer | 2016-08-30 08:35:25 +0000 | |
commit | 5b942ff65ff2ef64dae40f94dfd7c3153e94779c (patch) | |
tree | b16e34438449f43be089e1506a4db2ad5afa6e13 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java | |
parent | 13c60d05942609e0979087bc9b33931de78bdd76 (diff) |
Hook up split-up resource processing tools for android_library
Behind a flag. Flow is:
parse -> merge -> validate
\--> compile
With fewer deps across the merge steps.
--
MOS_MIGRATED_REVID=131634115
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java index be7ae3047b..181cc91e09 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java @@ -318,6 +318,7 @@ public class AndroidResourcesProcessorBuilder { apkOut != null ? apkOut : primary.getApk(), manifestOut != null ? manifestOut : primary.getManifest(), sourceJarOut, + primary.getJavaClassJar(), primary.getArtifacts(ResourceType.ASSETS), primary.getArtifacts(ResourceType.RESOURCES), primary.getRoots(ResourceType.ASSETS), |