Add type assertion that TreeFileArtifact's parentTreeArtifact member is a

SpecialArtifact.

PiperOrigin-RevId: 184539696

1 files changed, 6 insertions, 5 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 e27b478866..fca322d84d 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
@@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
 import com.google.devtools.build.lib.actions.FailAction;
 import com.google.devtools.build.lib.actions.ParameterFile;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -1027,7 +1028,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
       createDexMergerAction(
           ruleContext, multidex ? "minimal" : "off", dexArchives, classesDex, mainDexList, dexopts);
     } else {
-      Artifact shardsToMerge =
+      SpecialArtifact shardsToMerge =
           createSharderAction(
               ruleContext,
               dexArchives,
@@ -1114,13 +1115,13 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
    *
    * @return Tree artifact containing dex archives to merge into exactly one .dex file each
    */
-  private static Artifact createSharderAction(
+  private static SpecialArtifact createSharderAction(
       RuleContext ruleContext,
       ImmutableList<Artifact> dexArchives,
       @Nullable Artifact mainDexList,
       boolean minimalMainDex,
       @Nullable Artifact inclusionFilterJar) {
-    Artifact outputTree =
+    SpecialArtifact outputTree =
         ruleContext.getTreeArtifact(
             ruleContext.getUniqueDirectory("dexsplits"), ruleContext.getBinOrGenfilesDirectory());
 
@@ -1168,8 +1169,8 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
    * @return Tree artifact containing zips with final dex files named for inclusion in an APK.
    */
   private static Artifact createTemplatedMergerActions(
-      RuleContext ruleContext, Artifact inputTree, Collection<String> dexopts) {
-    Artifact outputTree =
+      RuleContext ruleContext, SpecialArtifact inputTree, Collection<String> dexopts) {
+    SpecialArtifact outputTree =
         ruleContext.getTreeArtifact(
             ruleContext.getUniqueDirectory("dexfiles"), ruleContext.getBinOrGenfilesDirectory());
     SpawnActionTemplate.Builder dexmerger =