diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-11-04 16:27:34 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-11-07 09:51:28 +0000 |
| commit | 851a034a39126bcbda033df5521bec9c259028e8 (patch) | |
| tree | 54c53665943444a6ee0c10b037f0bfe0a638c600 /src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java | |
| parent | fa407e52920a9c187befc94cc13014c19dd6219d (diff) | |
aar_import exports AndroidManifest.xml by default.
This was an oversight on my part in the original implementation. As one
example, the Firebase AAR libraries contain AndroidManifest.xml's
with ${applicationId} and Google Play Services contain <meta-data> tags.
--
MOS_MIGRATED_REVID=138198047
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java index bf2685ec3e..6f41821774 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java @@ -90,7 +90,8 @@ public class AarImport implements RuleConfiguredTargetFactory { ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_R_TXT), ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_SYMBOLS_TXT), ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST), - ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP)); + ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP), + /* alwaysExportManifest = */ true); NestedSetBuilder<Artifact> filesToBuildBuilder = NestedSetBuilder.<Artifact>stableOrder().add(resources).add(mergedJar); |