diff options
| author |  Andrew Pellegrini <apell@google.com> | 2016-05-06 18:10:33 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-05-09 07:07:44 +0000 |
| commit | 91552eea695bbd93b61bfead7a6dce6202f98a61 (patch) | |
| tree | 7821ec2fba2bcdb5cb42962ebfb715c7d9940af1 /src | |
| parent | a2926de7c8e34604d3dc9231dd2f985aeb795313 (diff) | |
Fixes .aar being created with manifest placeholders ${applicationId} and ${packageName} replaced for android_library targets.
--
MOS_MIGRATED_REVID=121691343
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) |