diff options
| author |  Michael Staib <mstaib@google.com> | 2016-11-18 18:59:42 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-11-21 19:36:50 +0000 |
| commit | 67b4d5250edcefa7220e928e529b1f385e2dc464 (patch) | |
| tree | 55544d96e23018586178f54a675f3a428e3a8f63 | |
| parent | a5312cdfe3dee6d34a32592c00d80e8142f89615 (diff) | |
Pass direct jars to Jack.
The R class generator produces a compiled jar, not a java source file.
This means all android libraries/binaries with resources will need to
convert this jar to jack to ensure that they have access to jars.
This change will not fix Jack builds, but it is a necessary step toward
fixing them.
--
MOS_MIGRATED_REVID=139599250
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java index 3f4c1b47fc..455ee0229d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java @@ -636,6 +636,7 @@ public class AndroidCommon { // sources .addJavaSources(attributes.getSourceFiles()) .addSourceJars(attributes.getSourceJars()) + .addCompiledJars(attributes.getDirectJars().toCollection()) .addResources(attributes.getResources()) .addProcessorNames(attributes.getProcessorNames()) .addProcessorClasspathJars(attributes.getProcessorPath()) |