Use processed instead of merged manifest in android deploy info

The processed manifest has applicationId subbing
while the merged one is before substitution (if
the developer hasn't migrated to the new gradle-
style manifest merger).

--
MOS_MIGRATED_REVID=130046777

1 files changed, 3 insertions, 3 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 b42d29b9f1..97715cb689 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
@@ -466,7 +466,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     Artifact deployInfo = ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.DEPLOY_INFO);
     AndroidDeployInfoAction.createDeployInfoAction(ruleContext,
         deployInfo,
-        applicationManifest.getManifest(),
+        resourceApk.getManifest(),
         additionalMergedManifests,
         Iterables.concat(ImmutableList.of(zipAlignedApk), apksUnderTest),
         dataDeps);
@@ -541,7 +541,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
 
     AndroidDeployInfoAction.createDeployInfoAction(ruleContext,
         incrementalDeployInfo,
-        applicationManifest.getManifest(),
+        resourceApk.getManifest(),
         additionalMergedManifests,
         ImmutableList.<Artifact>of(),
         dataDeps);
@@ -640,7 +640,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     AndroidDeployInfoAction.createDeployInfoAction(
         ruleContext,
         splitDeployInfo,
-        applicationManifest.getManifest(),
+        resourceApk.getManifest(),
         additionalMergedManifests,
         ImmutableList.<Artifact>of(),
         dataDeps);