diff options
author | ajmichael <ajmichael@google.com> | 2017-11-15 14:10:00 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-11-15 14:11:59 -0800 |
commit | dc7399af31d53d9b94b844baaee3e7c918cf10d4 (patch) | |
tree | e9a244ba4cdb442d2cf0d5c2fa1e9461649eec89 /src/main/java/com/google/devtools/build | |
parent | ee8c41999ca2b5549dfaec9afcd83b06ff198d1c (diff) |
Stop adding data deps to AndroidDeployInfo proto.
This is not used by ASwB, and it also doesn't make sense to live in AndroidBinary since android_binary does nothing with it's data deps and they should be removed (b/69371443).
RELNOTES: None
PiperOrigin-RevId: 175877850
Diffstat (limited to 'src/main/java/com/google/devtools/build')
3 files changed, 8 insertions, 28 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 7819939bb0..917e6ec20d 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 @@ -579,20 +579,13 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { filesBuilder.add(zipAlignedApk); NestedSet<Artifact> filesToBuild = filesBuilder.build(); - ImmutableList<Artifact> dataDeps = ImmutableList.of(); - if (ruleContext.attributes().has("data", BuildType.LABEL_LIST) - && ruleContext.getAttributeMode("data") == Mode.DATA) { - dataDeps = ruleContext.getPrerequisiteArtifacts("data", Mode.DATA).list(); - } - Artifact deployInfo = ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.DEPLOY_INFO); AndroidDeployInfoAction.createDeployInfoAction( ruleContext, deployInfo, resourceApk.getManifest(), additionalMergedManifests, - ImmutableList.<Artifact>builder().add(zipAlignedApk).addAll(apksUnderTest).build(), - dataDeps); + ImmutableList.<Artifact>builder().add(zipAlignedApk).addAll(apksUnderTest).build()); Artifact debugKeystore = AndroidCommon.getApkDebugSigningKey(ruleContext); Artifact apkManifest = @@ -669,7 +662,6 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { resourceExtractor, nativeLibsZips, signingKey, - dataDeps, additionalMergedManifests, applicationManifest); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java index a6e97d76b3..ef190b84ef 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java @@ -135,7 +135,6 @@ public final class AndroidBinaryMobileInstall { FilesToRunProvider resourceExtractor, NestedSet<Artifact> nativeLibsZips, Artifact signingKey, - ImmutableList<Artifact> dataDeps, ImmutableList<Artifact> additionalMergedManifests, ApplicationManifest applicationManifest) throws InterruptedException, RuleErrorException { @@ -309,8 +308,7 @@ public final class AndroidBinaryMobileInstall { incrementalDeployInfo, resourceApk.getManifest(), additionalMergedManifests, - ImmutableList.<Artifact>of(), - dataDeps); + ImmutableList.<Artifact>of()); Artifact splitDeployInfo = ruleContext.getImplicitOutputArtifact( AndroidRuleClasses.DEPLOY_INFO_SPLIT); @@ -319,8 +317,7 @@ public final class AndroidBinaryMobileInstall { splitDeployInfo, resourceApk.getManifest(), additionalMergedManifests, - ImmutableList.<Artifact>of(), - dataDeps); + ImmutableList.<Artifact>of()); NestedSet<Artifact> fullInstallOutputGroup = NestedSetBuilder.<Artifact>stableOrder() .add(fullDeployMarker) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java index 91d6fcb21c..8fb0b4cc2c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java @@ -42,14 +42,12 @@ public final class AndroidDeployInfoAction extends AbstractFileWriteAction { private static Iterable<Artifact> makeInputs( Artifact mergedManifest, Iterable<Artifact> additionalMergedManifests, - Iterable<Artifact> apksToDeploy, - Iterable<Artifact> dataDeps) { + Iterable<Artifact> apksToDeploy) { return ImmutableList.<Artifact>builder() .add(mergedManifest) .addAll(additionalMergedManifests) .addAll(apksToDeploy) - .addAll(dataDeps) .build(); } @@ -58,21 +56,18 @@ public final class AndroidDeployInfoAction extends AbstractFileWriteAction { private final Artifact mergedManifest; private final ImmutableList<Artifact> additionalMergedManifests; private final ImmutableList<Artifact> apksToDeploy; - private final ImmutableList<Artifact> dataDeps; AndroidDeployInfoAction( ActionOwner owner, Artifact outputFile, Artifact mergedManifest, ImmutableList<Artifact> additionalMergedManifests, - ImmutableList<Artifact> apksToDeploy, - ImmutableList<Artifact> dataDeps) { - super(owner, makeInputs(mergedManifest, additionalMergedManifests, apksToDeploy, dataDeps), + ImmutableList<Artifact> apksToDeploy) { + super(owner, makeInputs(mergedManifest, additionalMergedManifests, apksToDeploy), outputFile, false); this.mergedManifest = mergedManifest; this.additionalMergedManifests = additionalMergedManifests; this.apksToDeploy = apksToDeploy; - this.dataDeps = dataDeps; } private ByteString getByteString() { @@ -85,9 +80,6 @@ public final class AndroidDeployInfoAction extends AbstractFileWriteAction { for (Artifact apk : apksToDeploy) { builder.addApksToDeploy(makeArtifactProto(apk)); } - for (Artifact dataDep : dataDeps) { - builder.addDataToDeploy(makeArtifactProto(dataDep)); - } return builder.build().toByteString(); } @@ -96,10 +88,9 @@ public final class AndroidDeployInfoAction extends AbstractFileWriteAction { Artifact deployInfo, Artifact mergedManifest, ImmutableList<Artifact> additionalMergedManifests, - ImmutableList<Artifact> apksToDeploy, - ImmutableList<Artifact> dataDeps) { + ImmutableList<Artifact> apksToDeploy) { Action action = new AndroidDeployInfoAction(ruleContext.getActionOwner(), - deployInfo, mergedManifest, additionalMergedManifests, apksToDeploy, dataDeps); + deployInfo, mergedManifest, additionalMergedManifests, apksToDeploy); ruleContext.registerAction(action); } |