diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index ed5a839a27..9bff63a070 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -178,7 +178,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { new AarGeneratorBuilder(ruleContext) .withPrimary(primaryResources) - .withManifest(primaryResources.getManifest()) + .withManifest(aar != null ? aar.getManifest() : primaryResources.getManifest()) .withRtxt(primaryResources.getRTxt()) .withClasses(classesJar) .setAAROut(aarOut) |