From 67b4d5250edcefa7220e928e529b1f385e2dc464 Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Fri, 18 Nov 2016 18:59:42 +0000 Subject: 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 --- .../java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 1 + 1 file changed, 1 insertion(+) 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()) -- cgit v1.2.3