aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
diff options
context:
space:
mode:
authorGravatar Andrew Pellegrini <apell@google.com>2016-05-09 17:52:22 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-05-10 07:56:05 +0000
commit219150f8d2c0d595007fbfa9506702f86bb13a9c (patch)
tree4aaed529be1e11e6de7daec871695c327f585e23 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
parent925fd546efd612bdaab7187404f15a2771fff46d (diff)
Persist manifest changes made in AndroidResourceProcessingAction back to android_manifest rules to allow use in further processing steps.
-- MOS_MIGRATED_REVID=121852819
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.java2
1 files changed, 1 insertions, 1 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 719ac03477..bd566b243c 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
@@ -233,7 +233,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
false, /* incremental */
ProguardHelper.getProguardConfigArtifact(ruleContext, ""),
createMainDexProguardSpec(ruleContext),
- null, /* manifestOut */
+ ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST),
ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP));
if (ruleContext.hasErrors()) {
return null;