diff options
author | ajmichael <ajmichael@google.com> | 2017-04-04 14:54:14 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-04-04 18:39:31 +0200 |
commit | 0297702d9533142e6c326660f913899d25b89b5d (patch) | |
tree | 3dc2f7e79a783aa1d8a30d31e160971eafef0eed /src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | |
parent | a00c6249a7dea381a384e13c336c61211ac83965 (diff) |
Remove jack support and make jack/jill attributes of android_sdk optional.
Closes https://github.com/bazelbuild/bazel/issues/1391.
RELNOTES: Removed --experimental_use_jack_for_dexing and libname.jack output of
android_library.
PiperOrigin-RevId: 152131075
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index bc6d3e2603..8c9887d365 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -493,19 +493,17 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { Artifact jarToDex = proguardOutput.getOutputJar(); DexingOutput dexingOutput = - shouldDexWithJack(ruleContext) - ? dexWithJack(ruleContext, androidCommon, proguardSpecs) - : dex( - ruleContext, - androidSemantics, - binaryJar, - jarToDex, - isBinaryJarFiltered, - androidCommon, - resourceApk.getMainDexProguardConfig(), - resourceClasses, - derivedJarFunction, - proguardOutputMap); + dex( + ruleContext, + androidSemantics, + binaryJar, + jarToDex, + isBinaryJarFiltered, + androidCommon, + resourceApk.getMainDexProguardConfig(), + resourceClasses, + derivedJarFunction, + proguardOutputMap); NestedSet<Artifact> nativeLibsZips = AndroidCommon.collectTransitiveNativeLibsZips(ruleContext).build(); @@ -1194,23 +1192,6 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { } } - static boolean shouldDexWithJack(RuleContext ruleContext) { - return ruleContext - .getFragment(AndroidConfiguration.class) - .isJackUsedForDexing(); - } - - static DexingOutput dexWithJack( - RuleContext ruleContext, AndroidCommon androidCommon, ImmutableList<Artifact> proguardSpecs) { - Artifact classesDexZip = - androidCommon.compileDexWithJack( - getMultidexMode(ruleContext), - Optional.fromNullable( - ruleContext.getPrerequisiteArtifact("main_dex_list", Mode.TARGET)), - proguardSpecs); - return new DexingOutput(classesDexZip, null, ImmutableList.of(classesDexZip)); - } - /** Creates one or more classes.dex files that correspond to {@code proguardedJar}. */ private static DexingOutput dex( RuleContext ruleContext, |