diff options
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.java | 19 |
1 files changed, 9 insertions, 10 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 9653e05376..f8490e1cbb 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 @@ -451,6 +451,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { filesBuilder.add(binaryJar); filesBuilder.add(unsignedApk); filesBuilder.add(zipAlignedApk); + NestedSet<Artifact> filesToBuild = filesBuilder.build(); Artifact deployInfo = ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.DEPLOY_INFO); AndroidDeployInfoAction.createDeployInfoAction(ruleContext, @@ -458,9 +459,6 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { applicationManifest.getManifest(), additionalMergedManifests, Iterables.concat(ImmutableList.of(zipAlignedApk), apksUnderTest)); - filesBuilder.add(deployInfo); - - NestedSet<Artifact> filesToBuild = filesBuilder.build(); NestedSet<Artifact> coverageMetadata = (androidCommon.getInstrumentedJar() != null) ? NestedSetBuilder.create(Order.STABLE_ORDER, androidCommon.getInstrumentedJar()) @@ -538,12 +536,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { additionalMergedManifests, ImmutableList.<Artifact>of()); - NestedSet<Artifact> fullOutputGroup = NestedSetBuilder.<Artifact>stableOrder() + NestedSet<Artifact> fullInstallOutputGroup = NestedSetBuilder.<Artifact>stableOrder() .add(fullDeployMarker) .add(incrementalDeployInfo) .build(); - NestedSet<Artifact> incrementalOutputGroup = NestedSetBuilder.<Artifact>stableOrder() + NestedSet<Artifact> incrementalInstallOutputGroup = NestedSetBuilder.<Artifact>stableOrder() .add(incrementalDeployMarker) .add(incrementalDeployInfo) .build(); @@ -638,7 +636,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { additionalMergedManifests, ImmutableList.<Artifact>of()); - NestedSet<Artifact> splitOutputGroup = NestedSetBuilder.<Artifact>stableOrder() + NestedSet<Artifact> splitInstallOutputGroup = NestedSetBuilder.<Artifact>stableOrder() .addTransitive(allSplitApks) .add(splitDeployMarker) .add(splitDeployInfo) @@ -699,11 +697,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { NestedSetBuilder.create(Order.STABLE_ORDER, applicationManifest.getManifest()) )) .add(AndroidPreDexJarProvider.class, new AndroidPreDexJarProvider(jarToDex)) - .addOutputGroup("mobile_install_full", fullOutputGroup) - .addOutputGroup("mobile_install_incremental", incrementalOutputGroup) - .addOutputGroup("mobile_install_split", splitOutputGroup) + .addOutputGroup("mobile_install_full", fullInstallOutputGroup) + .addOutputGroup("mobile_install_incremental", incrementalInstallOutputGroup) + .addOutputGroup("mobile_install_split", splitInstallOutputGroup) .addOutputGroup("apk_manifest", apkManifest) - .addOutputGroup("apk_manifest_text", apkManifestText); + .addOutputGroup("apk_manifest_text", apkManifestText) + .addOutputGroup("android_deploy_info", deployInfo); } private static void createSplitInstallAction(RuleContext ruleContext, |