aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
diff options
context:
space:
mode:
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.java8
1 files changed, 4 insertions, 4 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 6026c40bb1..dd47b4484d 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
@@ -386,8 +386,8 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
derivedJarFunction,
proguardOutputMap);
- NestedSet<Artifact> nativeLibsZips =
- AndroidCommon.collectTransitiveNativeLibsZips(ruleContext).build();
+ NestedSet<Artifact> nativeLibsAar =
+ AndroidCommon.collectTransitiveNativeLibs(ruleContext).build();
DexPostprocessingOutput dexPostprocessingOutput =
androidSemantics.postprocessClassesDexZip(
@@ -461,7 +461,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
.setClassesDex(finalClassesDex)
.addInputZip(resourceApk.getArtifact())
.setJavaResourceZip(dexingOutput.javaResourceJar, resourceExtractor)
- .addInputZips(nativeLibsZips)
+ .addInputZips(nativeLibsAar)
.setNativeLibs(nativeLibs)
.setUnsignedApk(unsignedApk)
.setSignedApk(zipAlignedApk)
@@ -559,7 +559,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
resourceApk,
mobileInstallResourceApks,
resourceExtractor,
- nativeLibsZips,
+ nativeLibsAar,
signingKey,
additionalMergedManifests,
applicationManifest);