diff options
| author |  Alex Humesky <ahumesky@google.com> | 2016-12-05 21:33:26 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-12-06 12:05:31 +0000 |
| commit | 09b92a8fc9a6e4fcf451c71be098d9ba6ab379ac (patch) | |
| tree | a0ae17dc1a4d4769bbdb8b87f453f5389e142462 /src/main/java/com/google/devtools/build/lib/rules/android | |
| parent | 3f008a0bec454a9f83415b5f23ddd7c710e25b7c (diff) | |
Rollback of commit 67b4d5250edcefa7220e928e529b1f385e2dc464.
*** Reason for rollback ***
Memory regression: []
*** Original change description ***
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.
--
PiperOrigin-RevId: 141091215
MOS_MIGRATED_REVID=141091215
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 1 |
1 files changed, 0 insertions, 1 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 8dfe771c21..04576835f9 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 @@ -641,7 +641,6 @@ public class AndroidCommon { // sources .addJavaSources(attributes.getSourceFiles()) .addSourceJars(attributes.getSourceJars()) - .addCompiledJars(attributes.getDirectJars().toCollection()) .addResources(attributes.getResources()) .addProcessorNames(attributes.getProcessorNames()) .addProcessorClasspathJars(attributes.getProcessorPath()) |