diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java
index 052918602b4c7f..b542fb7b7316ed 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java
@@ -100,8 +100,7 @@ public static OrderedSetMultimap<Dependency, ConfiguredAspect> resolveAspectDepe
         result.put(dep, aspectValue.getConfiguredAspect());
         if (transitivePackages != null) {
           transitivePackages.addTransitive(
-              Preconditions.checkNotNull(
-                  aspectValue.getTransitivePackagesForPackageRootResolution()));
+              Preconditions.checkNotNull(aspectValue.getTransitivePackages()));
         }
       }
     }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
index d9338474b9d237..258cf937dea9da 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
@@ -35,20 +35,20 @@ public final class AspectValue extends BasicActionLookupValue implements RuleCon
   @Nullable private AspectKey key;
   @Nullable private ConfiguredAspect configuredAspect;
   // May be null either after clearing or because transitive packages are not tracked.
-  @Nullable private transient NestedSet<Package> transitivePackagesForPackageRootResolution;
+  @Nullable private transient NestedSet<Package> transitivePackages;
 
   public AspectValue(
       AspectKey key,
       Aspect aspect,
       Location location,
       ConfiguredAspect configuredAspect,
-      NestedSet<Package> transitivePackagesForPackageRootResolution) {
+      NestedSet<Package> transitivePackages) {
     super(configuredAspect.getActions());
     this.key = key;
     this.aspect = Preconditions.checkNotNull(aspect, location);
     this.location = Preconditions.checkNotNull(location, aspect);
     this.configuredAspect = Preconditions.checkNotNull(configuredAspect, location);
-    this.transitivePackagesForPackageRootResolution = transitivePackagesForPackageRootResolution;
+    this.transitivePackages = transitivePackages;
   }
 
   public ConfiguredAspect getConfiguredAspect() {
@@ -79,13 +79,13 @@ public void clear(boolean clearEverything) {
       key = null;
       configuredAspect = null;
     }
-    transitivePackagesForPackageRootResolution = null;
+    transitivePackages = null;
   }
 
   @Nullable
   @Override
-  public NestedSet<Package> getTransitivePackagesForPackageRootResolution() {
-    return transitivePackagesForPackageRootResolution;
+  public NestedSet<Package> getTransitivePackages() {
+    return transitivePackages;
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java
index b06000ad50beec..f32ec4c9ff2b7f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java
@@ -26,14 +26,20 @@ public interface ConfiguredObjectValue extends NotComparableSkyValue {
   ProviderCollection getConfiguredObject();
 
   /**
-   * Returns the set of packages transitively loaded by this value. Must only be used for
-   * constructing the package -> source root map needed for some builds. If the caller has not
-   * specified that this map needs to be constructed (via the constructor argument in {@link
+   * Returns the set of packages transitively loaded by this value. Must only be used for:
+   *
+   * <ul>
+   *   <li>constructing the package -> source root map needed for some builds, OR
+   *   <li>building the repo mapping manifest for runfiles
+   * </ul>
+   *
+   * If the caller has not specified that this map needs to be constructed (via the constructor
+   * argument in {@link
    * com.google.devtools.build.lib.skyframe.ConfiguredTargetFunction#ConfiguredTargetFunction} or
    * {@link com.google.devtools.build.lib.skyframe.AspectFunction#AspectFunction}), calling this
    * will crash.
    */
-  NestedSet<Package> getTransitivePackagesForPackageRootResolution();
+  NestedSet<Package> getTransitivePackages();
 
   /**
    * Clears data from this value.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
index 31cd6108c2f318..2cfddc79043796 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -58,6 +58,7 @@
 import com.google.devtools.build.lib.packages.EnvironmentGroup;
 import com.google.devtools.build.lib.packages.InputFile;
 import com.google.devtools.build.lib.packages.OutputFile;
+import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.PackageGroup;
 import com.google.devtools.build.lib.packages.PackageGroupsRuleVisibility;
 import com.google.devtools.build.lib.packages.PackageSpecification;
@@ -181,6 +182,7 @@ public ConfiguredTarget createConfiguredTarget(
       OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> prerequisiteMap,
       ConfigConditions configConditions,
       @Nullable ToolchainCollection<ResolvedToolchainContext> toolchainContexts,
+      @Nullable NestedSet<Package> transitivePackages,
       ExecGroupCollection.Builder execGroupCollectionBuilder)
       throws InterruptedException, ActionConflictException, InvalidExecGroupException,
           AnalysisFailurePropagationException {
@@ -196,6 +198,7 @@ public ConfiguredTarget createConfiguredTarget(
             prerequisiteMap,
             configConditions,
             toolchainContexts,
+            transitivePackages,
             execGroupCollectionBuilder);
       } finally {
         CurrentRuleTracker.endConfiguredTarget();
@@ -290,6 +293,7 @@ private ConfiguredTarget createRule(
       OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> prerequisiteMap,
       ConfigConditions configConditions,
       @Nullable ToolchainCollection<ResolvedToolchainContext> toolchainContexts,
+      @Nullable NestedSet<Package> transitivePackages,
       ExecGroupCollection.Builder execGroupCollectionBuilder)
       throws InterruptedException, ActionConflictException, InvalidExecGroupException,
           AnalysisFailurePropagationException {
@@ -316,6 +320,7 @@ private ConfiguredTarget createRule(
                     ruleClassProvider.getFragmentRegistry().getUniversalFragments(),
                     configConditions,
                     prerequisiteMap.values()))
+            .setTransitivePackagesForRunfileRepoMappingManifest(transitivePackages)
             .build();
 
     List<NestedSet<AnalysisFailure>> analysisFailures =
@@ -506,6 +511,7 @@ public ConfiguredAspect createAspect(
       @Nullable ExecGroupCollection.Builder execGroupCollectionBuilder,
       BuildConfigurationValue aspectConfiguration,
       BuildConfigurationValue hostConfiguration,
+      @Nullable NestedSet<Package> transitivePackages,
       AspectKeyCreator.AspectKey aspectKey)
       throws InterruptedException, ActionConflictException, InvalidExecGroupException {
     RuleContext ruleContext =
@@ -533,6 +539,7 @@ public ConfiguredAspect createAspect(
                     ruleClassProvider.getFragmentRegistry().getUniversalFragments(),
                     configConditions,
                     Iterables.concat(prerequisiteMap.values(), ImmutableList.of(associatedTarget))))
+            .setTransitivePackagesForRunfileRepoMappingManifest(transitivePackages)
             .build();
 
     // If allowing analysis failures, targets should be created as normal as possible, and errors
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index d7fa51447e11e9..959fc1530dec9b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -76,6 +76,7 @@
 import com.google.devtools.build.lib.packages.Info;
 import com.google.devtools.build.lib.packages.InputFile;
 import com.google.devtools.build.lib.packages.OutputFile;
+import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.Package.ConfigSettingVisibilityPolicy;
 import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
 import com.google.devtools.build.lib.packages.RawAttributeMapper;
@@ -165,6 +166,7 @@ void validate(
   @Nullable private final ToolchainCollection<ResolvedToolchainContext> toolchainContexts;
   private final ExecGroupCollection execGroupCollection;
   @Nullable private final RequiredConfigFragmentsProvider requiredConfigFragments;
+  @Nullable private final NestedSet<Package> transitivePackagesForRunfileRepoMappingManifest;
   private final List<Expander> makeVariableExpanders = new ArrayList<>();
 
   /** Map of exec group names to ActionOwners. */
@@ -222,6 +224,8 @@ private RuleContext(
     this.toolchainContexts = builder.toolchainContexts;
     this.execGroupCollection = execGroupCollection;
     this.requiredConfigFragments = builder.requiredConfigFragments;
+    this.transitivePackagesForRunfileRepoMappingManifest =
+        builder.transitivePackagesForRunfileRepoMappingManifest;
     this.starlarkThread = createStarlarkThread(builder.mutability); // uses above state
   }
 
@@ -1285,6 +1289,17 @@ public RequiredConfigFragmentsProvider getRequiredConfigFragments() {
     return merged == null ? requiredConfigFragments : merged.build();
   }
 
+  /**
+   * Returns the set of transitive packages. This is only intended to be used to create the repo
+   * mapping manifest for the runfiles tree. Can be null if transitive packages are not tracked (see
+   * {@link
+   * com.google.devtools.build.lib.skyframe.SkyframeExecutor#shouldStoreTransitivePackagesInLoadingAndAnalysis}).
+   */
+  @Nullable
+  public NestedSet<Package> getTransitivePackagesForRunfileRepoMappingManifest() {
+    return transitivePackagesForRunfileRepoMappingManifest;
+  }
+
   private boolean isUserDefinedMakeVariable(String makeVariable) {
     // User-defined make values may be set either in "--define foo=bar" or in a vardef in the rule's
     // package. Both are equivalent for these purposes, since in both cases setting
@@ -1651,6 +1666,7 @@ public static final class Builder implements RuleErrorConsumer {
     private ExecGroupCollection.Builder execGroupCollectionBuilder;
     private ImmutableMap<String, String> rawExecProperties;
     @Nullable private RequiredConfigFragmentsProvider requiredConfigFragments;
+    @Nullable private NestedSet<Package> transitivePackagesForRunfileRepoMappingManifest;
 
     @VisibleForTesting
     public Builder(
@@ -1877,6 +1893,12 @@ public Builder setRequiredConfigFragments(
       return this;
     }
 
+    @CanIgnoreReturnValue
+    public Builder setTransitivePackagesForRunfileRepoMappingManifest(
+        @Nullable NestedSet<Package> packages) {
+      this.transitivePackagesForRunfileRepoMappingManifest = packages;
+      return this;
+    }
 
     /** Determines and returns a map from attribute name to list of configured targets. */
     private ImmutableSortedKeyListMultimap<String, ConfiguredTargetAndData> createTargetMap() {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/constraints/IncompatibleTargetChecker.java b/src/main/java/com/google/devtools/build/lib/analysis/constraints/IncompatibleTargetChecker.java
index 5f5a306575b8d3..d25ba108c287d3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/constraints/IncompatibleTargetChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/constraints/IncompatibleTargetChecker.java
@@ -104,7 +104,7 @@ public static Optional<RuleConfiguredTargetValue> createDirectlyIncompatibleTarg
       ConfigConditions configConditions,
       Environment env,
       @Nullable PlatformInfo platformInfo,
-      NestedSetBuilder<Package> transitivePackagesForPackageRootResolution)
+      NestedSetBuilder<Package> transitivePackages)
       throws InterruptedException {
     Target target = targetAndConfiguration.getTarget();
     Rule rule = target.getAssociatedRule();
@@ -157,7 +157,7 @@ public static Optional<RuleConfiguredTargetValue> createDirectlyIncompatibleTarg
             IncompatiblePlatformProvider.incompatibleDueToConstraints(
                 platformInfo.label(), invalidConstraintValues),
             rule.getRuleClass(),
-            transitivePackagesForPackageRootResolution));
+            transitivePackages));
   }
 
   /**
@@ -181,7 +181,7 @@ public static Optional<RuleConfiguredTargetValue> createIndirectlyIncompatibleTa
       OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> depValueMap,
       ConfigConditions configConditions,
       @Nullable PlatformInfo platformInfo,
-      NestedSetBuilder<Package> transitivePackagesForPackageRootResolution) {
+      NestedSetBuilder<Package> transitivePackages) {
     Target target = targetAndConfiguration.getTarget();
     Rule rule = target.getAssociatedRule();
 
@@ -209,7 +209,7 @@ public static Optional<RuleConfiguredTargetValue> createIndirectlyIncompatibleTa
             configConditions,
             IncompatiblePlatformProvider.incompatibleDueToTargets(platformLabel, incompatibleDeps),
             rule.getRuleClass(),
-            transitivePackagesForPackageRootResolution));
+            transitivePackages));
   }
 
   /** Creates an incompatible target. */
@@ -219,7 +219,7 @@ private static RuleConfiguredTargetValue createIncompatibleRuleConfiguredTarget(
       ConfigConditions configConditions,
       IncompatiblePlatformProvider incompatiblePlatformProvider,
       String ruleClassString,
-      NestedSetBuilder<Package> transitivePackagesForPackageRootResolution) {
+      NestedSetBuilder<Package> transitivePackages) {
     // Create dummy instances of the necessary data for a configured target. None of this data will
     // actually be used because actions associated with incompatible targets must not be evaluated.
     NestedSet<Artifact> filesToBuild = NestedSetBuilder.emptySet(Order.STABLE_ORDER);
@@ -248,10 +248,7 @@ private static RuleConfiguredTargetValue createIncompatibleRuleConfiguredTarget(
             configConditions.asProviders(),
             ruleClassString);
     return new RuleConfiguredTargetValue(
-        configuredTarget,
-        transitivePackagesForPackageRootResolution == null
-            ? null
-            : transitivePackagesForPackageRootResolution.build());
+        configuredTarget, transitivePackages == null ? null : transitivePackages.build());
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index f1e15e62028753..6995cf4f641833 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -120,24 +120,24 @@ final class AspectFunction implements SkyFunction {
   private final RuleClassProvider ruleClassProvider;
   /**
    * Indicates whether the set of packages transitively loaded for a given {@link AspectValue} will
-   * be needed for package root resolution later in the build. If not, they are not collected and
-   * stored.
+   * be needed later (see {@link
+   * com.google.devtools.build.lib.analysis.ConfiguredObjectValue#getTransitivePackages}). If not,
+   * they are not collected and stored.
    */
-  private final boolean storeTransitivePackagesForPackageRootResolution;
+  private final boolean storeTransitivePackages;
 
   AspectFunction(
       BuildViewProvider buildViewProvider,
       RuleClassProvider ruleClassProvider,
-      boolean storeTransitivePackagesForPackageRootResolution) {
+      boolean storeTransitivePackages) {
     this.buildViewProvider = buildViewProvider;
     this.ruleClassProvider = ruleClassProvider;
-    this.storeTransitivePackagesForPackageRootResolution =
-        storeTransitivePackagesForPackageRootResolution;
+    this.storeTransitivePackages = storeTransitivePackages;
   }
 
   static class State implements SkyKeyComputeState {
     /** Null if AspectFuncton is not storing this information. */
-    @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution;
+    @Nullable NestedSetBuilder<Package> transitivePackages;
 
     NestedSetBuilder<Cause> transitiveRootCauses = NestedSetBuilder.stableOrder();
 
@@ -145,9 +145,8 @@ static class State implements SkyKeyComputeState {
 
     ComputeDependenciesState computeDependenciesState = new ComputeDependenciesState();
 
-    State(boolean storeTransitivePackagesForPackageRootResolution) {
-      this.transitivePackagesForPackageRootResolution =
-          storeTransitivePackagesForPackageRootResolution ? NestedSetBuilder.stableOrder() : null;
+    State(boolean storeTransitivePackages) {
+      this.transitivePackages = storeTransitivePackages ? NestedSetBuilder.stableOrder() : null;
     }
   }
 
@@ -177,7 +176,7 @@ private InitialValues(
   public SkyValue compute(SkyKey skyKey, Environment env)
       throws AspectFunctionException, InterruptedException {
     AspectKey key = (AspectKey) skyKey.argument();
-    State state = env.getState(() -> new State(storeTransitivePackagesForPackageRootResolution));
+    State state = env.getState(() -> new State(storeTransitivePackages));
 
     if (state.initialValues == null) {
       InitialValues initialValues = getInitialValues(key, env);
@@ -201,7 +200,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
           aspect,
           target.getLocation(),
           ConfiguredAspect.forNonapplicableTarget(),
-          state.transitivePackagesForPackageRootResolution.build());
+          state.transitivePackages.build());
     }
 
     if (AliasProvider.isAlias(associatedTarget)) {
@@ -242,8 +241,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
               aspect,
               target.getLocation(),
               ConfiguredAspect.forNonapplicableTarget(),
-              /*transitivePackagesForPackageRootResolution=*/ NestedSetBuilder.emptySet(
-                  Order.STABLE_ORDER));
+              /*transitivePackages=*/ NestedSetBuilder.emptySet(Order.STABLE_ORDER));
         }
       }
     }
@@ -306,7 +304,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
           ConfiguredTargetFunction.getConfigConditions(
               env,
               originalTargetAndConfiguration,
-              state.transitivePackagesForPackageRootResolution,
+              state.transitivePackages,
               unloadedToolchainContexts == null
                   ? null
                   : unloadedToolchainContexts.getTargetPlatform(),
@@ -321,7 +319,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
         depValueMap =
             ConfiguredTargetFunction.computeDependencies(
                 state.computeDependenciesState,
-                state.transitivePackagesForPackageRootResolution,
+                state.transitivePackages,
                 state.transitiveRootCauses,
                 env,
                 resolver,
@@ -382,7 +380,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
           toolchainContexts,
           execGroupCollectionBuilder,
           depValueMap,
-          state.transitivePackagesForPackageRootResolution);
+          state.transitivePackages);
     } catch (DependencyEvaluationException e) {
       // TODO(bazel-team): consolidate all env.getListener().handle() calls in this method, like in
       // ConfiguredTargetFunction. This encourages clear, consistent user messages (ideally without
@@ -634,8 +632,8 @@ private AspectValue createAliasAspect(
     // the real configured target.
     Label aliasedLabel = aliasChain.size() > 1 ? aliasChain.get(1) : configuredTarget.getLabel();
 
-    NestedSetBuilder<Package> transitivePackagesForPackageRootResolution =
-        storeTransitivePackagesForPackageRootResolution ? NestedSetBuilder.stableOrder() : null;
+    NestedSetBuilder<Package> transitivePackages =
+        storeTransitivePackages ? NestedSetBuilder.stableOrder() : null;
     NestedSetBuilder<Cause> transitiveRootCauses = NestedSetBuilder.stableOrder();
 
     // Compute the Dependency from originalTarget to aliasedLabel
@@ -659,7 +657,7 @@ private AspectValue createAliasAspect(
           ConfiguredTargetFunction.getConfigConditions(
               env,
               originalTargetAndAspectConfiguration,
-              transitivePackagesForPackageRootResolution,
+              transitivePackages,
               unloadedToolchainContexts == null
                   ? null
                   : unloadedToolchainContexts.getTargetPlatform(),
@@ -724,12 +722,7 @@ private AspectValue createAliasAspect(
     // Now that we have a Dependency, we can compute the aliased key and depend on it
     AspectKey actualKey = buildAliasAspectKey(originalKey, aliasedLabel, dep);
     return createAliasAspect(
-        env,
-        originalTarget.getTarget(),
-        originalKey,
-        aspect,
-        actualKey,
-        transitivePackagesForPackageRootResolution);
+        env, originalTarget.getTarget(), originalKey, aspect, actualKey, transitivePackages);
   }
 
   @Nullable
@@ -739,7 +732,7 @@ private static AspectValue createAliasAspect(
       AspectKey originalKey,
       Aspect aspect,
       AspectKey depKey,
-      @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution)
+      @Nullable NestedSetBuilder<Package> transitivePackages)
       throws InterruptedException {
     // Compute the AspectValue of the target the alias refers to (which can itself be either an
     // alias or a real target)
@@ -748,12 +741,11 @@ private static AspectValue createAliasAspect(
       return null;
     }
 
-    NestedSet<Package> finalTransitivePackagesForPackageRootResolution = null;
-    if (transitivePackagesForPackageRootResolution != null) {
-      finalTransitivePackagesForPackageRootResolution =
-          transitivePackagesForPackageRootResolution
-              .addTransitive(
-                  Preconditions.checkNotNull(real.getTransitivePackagesForPackageRootResolution()))
+    NestedSet<Package> finalTransitivePackages = null;
+    if (transitivePackages != null) {
+      finalTransitivePackages =
+          transitivePackages
+              .addTransitive(Preconditions.checkNotNull(real.getTransitivePackages()))
               .add(originalTarget.getPackage())
               .build();
     }
@@ -762,7 +754,7 @@ private static AspectValue createAliasAspect(
         aspect,
         originalTarget.getLocation(),
         ConfiguredAspect.forAlias(real.getConfiguredAspect()),
-        finalTransitivePackagesForPackageRootResolution);
+        finalTransitivePackages);
   }
 
   @Nullable
@@ -839,7 +831,7 @@ private AspectValue createAspect(
       @Nullable ToolchainCollection<ResolvedToolchainContext> toolchainContexts,
       @Nullable ExecGroupCollection.Builder execGroupCollectionBuilder,
       OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> directDeps,
-      @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution)
+      @Nullable NestedSetBuilder<Package> transitivePackages)
       throws AspectFunctionException, InterruptedException {
     // Should be successfully evaluated and cached from the loading phase.
     StarlarkBuiltinsValue starlarkBuiltinsValue =
@@ -860,12 +852,7 @@ private AspectValue createAspect(
       OutputFile outputFile = (OutputFile) associatedTarget.getTarget();
       Label label = outputFile.getGeneratingRule().getLabel();
       return createAliasAspect(
-          env,
-          associatedTarget.getTarget(),
-          key,
-          aspect,
-          key.withLabel(label),
-          transitivePackagesForPackageRootResolution);
+          env, associatedTarget.getTarget(), key, aspect, key.withLabel(label), transitivePackages);
     } else if (AspectResolver.aspectMatchesConfiguredTarget(associatedTarget, aspect)) {
       try {
         CurrentRuleTracker.beginConfiguredAspect(aspect.getAspectClass());
@@ -883,6 +870,7 @@ private AspectValue createAspect(
                     execGroupCollectionBuilder,
                     configuration,
                     view.getHostConfiguration(),
+                    transitivePackages == null ? null : transitivePackages.build(),
                     key);
       } catch (MissingDepException e) {
         Preconditions.checkState(env.valuesMissing());
@@ -920,9 +908,7 @@ private AspectValue createAspect(
         aspect,
         associatedTarget.getTarget().getLocation(),
         configuredAspect,
-        transitivePackagesForPackageRootResolution == null
-            ? null
-            : transitivePackagesForPackageRootResolution.build());
+        transitivePackages == null ? null : transitivePackages.build());
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
index ecc21a246459a1..2ce6a3717f5853 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
@@ -241,11 +241,10 @@ private static void postTopLevelTargetAnalyzedEvent(
     // transitive packages for package root resolution is already cleared. In such a case, the
     // symlinks should have already been planted.
     TopLevelTargetAnalyzedEvent topLevelTargetAnalyzedEvent =
-        configuredTargetValue.getTransitivePackagesForPackageRootResolution() == null
+        configuredTargetValue.getTransitivePackages() == null
             ? TopLevelTargetAnalyzedEvent.createWithoutFurtherSymlinkPlanting(configuredTarget)
             : TopLevelTargetAnalyzedEvent.create(
-                configuredTarget,
-                configuredTargetValue.getTransitivePackagesForPackageRootResolution());
+                configuredTarget, configuredTargetValue.getTransitivePackages());
 
     env.getListener().post(topLevelTargetAnalyzedEvent);
   }
@@ -406,12 +405,10 @@ private static void postAspectAnalyzedEvent(
     // transitive packages for package root resolution is already cleared. In such a case, the
     // symlinks should have already been planted.
     AspectAnalyzedEvent aspectAnalyzedEvent =
-        aspectValue.getTransitivePackagesForPackageRootResolution() == null
+        aspectValue.getTransitivePackages() == null
             ? AspectAnalyzedEvent.createWithoutFurtherSymlinkPlanting(aspectKey, configuredAspect)
             : AspectAnalyzedEvent.create(
-                aspectKey,
-                configuredAspect,
-                aspectValue.getTransitivePackagesForPackageRootResolution());
+                aspectKey, configuredAspect, aspectValue.getTransitivePackages());
 
     env.getListener().post(aspectAnalyzedEvent);
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index 82d05a934689c5..7193f82b038d8a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -147,10 +147,11 @@ public static ConfiguredValueCreationException asConfiguredValueCreationExceptio
 
   /**
    * Indicates whether the set of packages transitively loaded for a given {@link
-   * ConfiguredTargetValue} will be needed for package root resolution later in the build. If not,
+   * ConfiguredTargetValue} will be needed later (see {@link
+   * com.google.devtools.build.lib.analysis.ConfiguredObjectValue#getTransitivePackages}). If not,
    * they are not collected and stored.
    */
-  private final boolean storeTransitivePackagesForPackageRootResolution;
+  private final boolean storeTransitivePackages;
 
   private final boolean shouldUnblockCpuWorkWhenFetchingDeps;
 
@@ -158,14 +159,13 @@ public static ConfiguredValueCreationException asConfiguredValueCreationExceptio
       BuildViewProvider buildViewProvider,
       RuleClassProvider ruleClassProvider,
       AtomicReference<Semaphore> cpuBoundSemaphore,
-      boolean storeTransitivePackagesForPackageRootResolution,
+      boolean storeTransitivePackages,
       boolean shouldUnblockCpuWorkWhenFetchingDeps,
       @Nullable ConfiguredTargetProgressReceiver configuredTargetProgress) {
     this.buildViewProvider = buildViewProvider;
     this.ruleClassProvider = ruleClassProvider;
     this.cpuBoundSemaphore = cpuBoundSemaphore;
-    this.storeTransitivePackagesForPackageRootResolution =
-        storeTransitivePackagesForPackageRootResolution;
+    this.storeTransitivePackages = storeTransitivePackages;
     this.shouldUnblockCpuWorkWhenFetchingDeps = shouldUnblockCpuWorkWhenFetchingDeps;
     this.configuredTargetProgress = configuredTargetProgress;
   }
@@ -191,7 +191,7 @@ private void maybeReleaseSemaphore() {
 
   static class State implements SkyKeyComputeState {
     /** Null if ConfiguredTargetFuncton is not storing this information. */
-    @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution;
+    @Nullable NestedSetBuilder<Package> transitivePackages;
 
     NestedSetBuilder<Cause> transitiveRootCauses = NestedSetBuilder.stableOrder();
 
@@ -199,9 +199,8 @@ static class State implements SkyKeyComputeState {
 
     ComputeDependenciesState computeDependenciesState = new ComputeDependenciesState();
 
-    State(boolean storeTransitivePackagesForPackageRootResolution) {
-      this.transitivePackagesForPackageRootResolution =
-          storeTransitivePackagesForPackageRootResolution ? NestedSetBuilder.stableOrder() : null;
+    State(boolean storeTransitivePackages) {
+      this.transitivePackages = storeTransitivePackages ? NestedSetBuilder.stableOrder() : null;
     }
   }
 
@@ -250,7 +249,7 @@ static class ComputeDependenciesState implements SkyKeyComputeState {
   @Override
   public SkyValue compute(SkyKey key, Environment env)
       throws ReportedException, UnreportedException, InterruptedException {
-    State state = env.getState(() -> new State(storeTransitivePackagesForPackageRootResolution));
+    State state = env.getState(() -> new State(storeTransitivePackages));
 
     if (shouldUnblockCpuWorkWhenFetchingDeps) {
       // Fetching blocks on other resources, so we don't want to hold on to the semaphore meanwhile.
@@ -276,9 +275,7 @@ public SkyValue compute(SkyKey key, Environment env)
       // not prepared for it.
       return new NonRuleConfiguredTargetValue(
           new EmptyConfiguredTarget(target.getLabel(), configuredTargetKey.getConfigurationKey()),
-          state.transitivePackagesForPackageRootResolution == null
-              ? null
-              : state.transitivePackagesForPackageRootResolution.build());
+          state.transitivePackages == null ? null : state.transitivePackages.build());
     }
 
     SkyframeBuildView view = buildViewProvider.getSkyframeBuildView();
@@ -312,7 +309,7 @@ public SkyValue compute(SkyKey key, Environment env)
           getConfigConditions(
               env,
               targetAndConfiguration,
-              state.transitivePackagesForPackageRootResolution,
+              state.transitivePackages,
               platformInfo,
               state.transitiveRootCauses);
       if (env.valuesMissing()) {
@@ -344,7 +341,7 @@ public SkyValue compute(SkyKey key, Environment env)
               configConditions,
               env,
               platformInfo,
-              state.transitivePackagesForPackageRootResolution);
+              state.transitivePackages);
       if (incompatibleTarget == null) {
         return null;
       }
@@ -356,7 +353,7 @@ public SkyValue compute(SkyKey key, Environment env)
       OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> depValueMap =
           computeDependencies(
               state.computeDependenciesState,
-              state.transitivePackagesForPackageRootResolution,
+              state.transitivePackages,
               state.transitiveRootCauses,
               env,
               resolver,
@@ -390,7 +387,7 @@ public SkyValue compute(SkyKey key, Environment env)
               depValueMap,
               configConditions,
               platformInfo,
-              state.transitivePackagesForPackageRootResolution);
+              state.transitivePackages);
       if (incompatibleTarget.isPresent()) {
         return incompatibleTarget.get();
       }
@@ -423,7 +420,7 @@ public SkyValue compute(SkyKey key, Environment env)
               configConditions,
               toolchainContexts,
               execGroupCollectionBuilder,
-              state.transitivePackagesForPackageRootResolution);
+              state.transitivePackages);
       if (ans != null && configuredTargetProgress != null) {
         configuredTargetProgress.doneConfigureTarget();
       }
@@ -545,8 +542,8 @@ private static TargetAndConfiguration getTargetAndConfiguration(
       state.transitiveRootCauses.add(
           new LoadingFailedCause(label, DetailedExitCode.of(failureDetail)));
     }
-    if (state.transitivePackagesForPackageRootResolution != null) {
-      state.transitivePackagesForPackageRootResolution.add(pkg);
+    if (state.transitivePackages != null) {
+      state.transitivePackages.add(pkg);
     }
     state.targetAndConfiguration = new TargetAndConfiguration(target, configuration);
     return state.targetAndConfiguration;
@@ -780,7 +777,7 @@ public static ImmutableSet<Label> getExecutionPlatformConstraints(
   @Nullable
   static OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> computeDependencies(
       ComputeDependenciesState state,
-      @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution,
+      @Nullable NestedSetBuilder<Package> transitivePackages,
       NestedSetBuilder<Cause> transitiveRootCauses,
       Environment env,
       SkyframeDependencyResolver resolver,
@@ -877,11 +874,7 @@ static OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> computeDepend
       } else {
         depValues =
             resolveConfiguredTargetDependencies(
-                env,
-                ctgValue,
-                depValueNames.values(),
-                transitivePackagesForPackageRootResolution,
-                transitiveRootCauses);
+                env, ctgValue, depValueNames.values(), transitivePackages, transitiveRootCauses);
         if (env.valuesMissing()) {
           return null;
         }
@@ -895,7 +888,7 @@ static OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> computeDepend
       } else {
         depAspects =
             AspectResolver.resolveAspectDependencies(
-                env, depValues, depValueNames.values(), transitivePackagesForPackageRootResolution);
+                env, depValues, depValueNames.values(), transitivePackages);
         if (env.valuesMissing()) {
           return null;
         }
@@ -942,7 +935,7 @@ static OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> computeDepend
   static ConfigConditions getConfigConditions(
       Environment env,
       TargetAndConfiguration ctgValue,
-      @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution,
+      @Nullable NestedSetBuilder<Package> transitivePackages,
       @Nullable PlatformInfo platformInfo,
       NestedSetBuilder<Cause> transitiveRootCauses)
       throws ConfiguredValueCreationException, InterruptedException {
@@ -982,11 +975,7 @@ static ConfigConditions getConfigConditions(
     try {
       configValues =
           resolveConfiguredTargetDependencies(
-              env,
-              ctgValue,
-              configConditionDeps,
-              transitivePackagesForPackageRootResolution,
-              transitiveRootCauses);
+              env, ctgValue, configConditionDeps, transitivePackages, transitiveRootCauses);
       if (configValues == null) {
         return null;
       }
@@ -1040,7 +1029,7 @@ private static Map<SkyKey, ConfiguredTargetAndData> resolveConfiguredTargetDepen
       Environment env,
       TargetAndConfiguration ctgValue,
       Collection<Dependency> deps,
-      @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution,
+      @Nullable NestedSetBuilder<Package> transitivePackages,
       NestedSetBuilder<Cause> transitiveRootCauses)
       throws DependencyEvaluationException, InterruptedException {
     boolean missedValues = env.valuesMissing();
@@ -1144,9 +1133,9 @@ private static Map<SkyKey, ConfiguredTargetAndData> resolveConfiguredTargetDepen
         } catch (NoSuchTargetException e) {
           throw new IllegalStateException("Target already verified for " + dep, e);
         }
-        if (transitivePackagesForPackageRootResolution != null) {
-          transitivePackagesForPackageRootResolution.addTransitive(
-              Preconditions.checkNotNull(depValue.getTransitivePackagesForPackageRootResolution()));
+        if (transitivePackages != null) {
+          transitivePackages.addTransitive(
+              Preconditions.checkNotNull(depValue.getTransitivePackages()));
         }
       }
 
@@ -1182,7 +1171,7 @@ private static ConfiguredTargetValue createConfiguredTarget(
       ConfigConditions configConditions,
       @Nullable ToolchainCollection<ResolvedToolchainContext> toolchainContexts,
       ExecGroupCollection.Builder execGroupCollectionBuilder,
-      @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution)
+      @Nullable NestedSetBuilder<Package> transitivePackagesBuilder)
       throws ConfiguredValueCreationException, InterruptedException {
     Target target = ctgValue.getTarget();
     BuildConfigurationValue configuration = ctgValue.getConfiguration();
@@ -1194,6 +1183,8 @@ private static ConfiguredTargetValue createConfiguredTarget(
       return null;
     }
 
+    NestedSet<Package> transitivePackages =
+        transitivePackagesBuilder == null ? null : transitivePackagesBuilder.build();
     StoredEventHandler events = new StoredEventHandler();
     CachingAnalysisEnvironment analysisEnvironment =
         view.createAnalysisEnvironment(
@@ -1211,6 +1202,7 @@ private static ConfiguredTargetValue createConfiguredTarget(
               depValueMap,
               configConditions,
               toolchainContexts,
+              transitivePackages,
               execGroupCollectionBuilder);
     } catch (MissingDepException e) {
       Preconditions.checkState(env.valuesMissing(), e.getMessage());
@@ -1256,11 +1248,7 @@ private static ConfiguredTargetValue createConfiguredTarget(
 
     if (configuredTarget instanceof RuleConfiguredTarget) {
       RuleConfiguredTarget ruleConfiguredTarget = (RuleConfiguredTarget) configuredTarget;
-      return new RuleConfiguredTargetValue(
-          ruleConfiguredTarget,
-          transitivePackagesForPackageRootResolution == null
-              ? null
-              : transitivePackagesForPackageRootResolution.build());
+      return new RuleConfiguredTargetValue(ruleConfiguredTarget, transitivePackages);
     } else {
       // Expected 4 args, but got 3.
       Preconditions.checkState(
@@ -1269,11 +1257,7 @@ private static ConfiguredTargetValue createConfiguredTarget(
           configuredTargetKey,
           analysisEnvironment.getRegisteredActions(),
           configuredTarget);
-      return new NonRuleConfiguredTargetValue(
-          configuredTarget,
-          transitivePackagesForPackageRootResolution == null
-              ? null
-              : transitivePackagesForPackageRootResolution.build());
+      return new NonRuleConfiguredTargetValue(configuredTarget, transitivePackages);
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java
index 6a18796f3e4815..b58f3705e73992 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java
@@ -37,7 +37,7 @@ public final class NonRuleConfiguredTargetValue implements ConfiguredTargetValue
   @Nullable private ConfiguredTarget configuredTarget;
 
   // May be null either after clearing or because transitive packages are not tracked.
-  @Nullable private NestedSet<Package> transitivePackagesForPackageRootResolution;
+  @Nullable private NestedSet<Package> transitivePackages;
 
   @AutoCodec.Instantiator
   @VisibleForSerialization
@@ -48,10 +48,9 @@ public final class NonRuleConfiguredTargetValue implements ConfiguredTargetValue
   }
 
   NonRuleConfiguredTargetValue(
-      ConfiguredTarget configuredTarget,
-      @Nullable NestedSet<Package> transitivePackagesForPackageRootResolution) {
+      ConfiguredTarget configuredTarget, @Nullable NestedSet<Package> transitivePackages) {
     this.configuredTarget = Preconditions.checkNotNull(configuredTarget);
-    this.transitivePackagesForPackageRootResolution = transitivePackagesForPackageRootResolution;
+    this.transitivePackages = transitivePackages;
   }
 
   @Override
@@ -62,8 +61,8 @@ public ConfiguredTarget getConfiguredTarget() {
 
   @Nullable
   @Override
-  public NestedSet<Package> getTransitivePackagesForPackageRootResolution() {
-    return transitivePackagesForPackageRootResolution;
+  public NestedSet<Package> getTransitivePackages() {
+    return transitivePackages;
   }
 
   @Override
@@ -72,7 +71,7 @@ public void clear(boolean clearEverything) {
     if (clearEverything) {
       configuredTarget = null;
     }
-    transitivePackagesForPackageRootResolution = null;
+    transitivePackages = null;
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java
index a0221c0b8665f7..f4c9a0813d5d9d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java
@@ -41,19 +41,18 @@ public final class RuleConfiguredTargetValue
   private final ImmutableList<ActionAnalysisMetadata> actions;
 
   // May be null either after clearing or because transitive packages are not tracked.
-  @Nullable private NestedSet<Package> transitivePackagesForPackageRootResolution;
+  @Nullable private NestedSet<Package> transitivePackages;
 
   // Transitive packages are not serialized.
   @AutoCodec.Instantiator
   RuleConfiguredTargetValue(RuleConfiguredTarget configuredTarget) {
-    this(configuredTarget, /*transitivePackagesForPackageRootResolution=*/ null);
+    this(configuredTarget, /*transitivePackages=*/ null);
   }
 
   public RuleConfiguredTargetValue(
-      RuleConfiguredTarget configuredTarget,
-      @Nullable NestedSet<Package> transitivePackagesForPackageRootResolution) {
+      RuleConfiguredTarget configuredTarget, @Nullable NestedSet<Package> transitivePackages) {
     this.configuredTarget = Preconditions.checkNotNull(configuredTarget);
-    this.transitivePackagesForPackageRootResolution = transitivePackagesForPackageRootResolution;
+    this.transitivePackages = transitivePackages;
     // These are specifically *not* copied to save memory.
     this.actions = configuredTarget.getActions();
   }
@@ -71,8 +70,8 @@ public ImmutableList<ActionAnalysisMetadata> getActions() {
 
   @Nullable
   @Override
-  public NestedSet<Package> getTransitivePackagesForPackageRootResolution() {
-    return transitivePackagesForPackageRootResolution;
+  public NestedSet<Package> getTransitivePackages() {
+    return transitivePackages;
   }
 
   @Override
@@ -81,7 +80,7 @@ public void clear(boolean clearEverything) {
     if (clearEverything) {
       configuredTarget = null;
     }
-    transitivePackagesForPackageRootResolution = null;
+    transitivePackages = null;
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index d77d5c78e061ea..484114c3a8f39f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -73,6 +73,7 @@
 import com.google.devtools.build.lib.causes.AnalysisFailedCause;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.events.Event;
@@ -388,9 +389,7 @@ public SkyframeAnalysisResult configureTargets(
         AspectValue aspectValue = (AspectValue) val;
         aspects.put(aspectValue.getKey(), aspectValue.getConfiguredAspect());
         if (packages != null) {
-          packages.addTransitive(
-              Preconditions.checkNotNull(
-                  aspectValue.getTransitivePackagesForPackageRootResolution()));
+          packages.addTransitive(Preconditions.checkNotNull(aspectValue.getTransitivePackages()));
         }
         aspectKeysBuilder.add(aspectValue.getKey());
       }
@@ -405,8 +404,7 @@ public SkyframeAnalysisResult configureTargets(
       }
       cts.add(ctValue.getConfiguredTarget());
       if (packages != null) {
-        packages.addTransitive(
-            Preconditions.checkNotNull(ctValue.getTransitivePackagesForPackageRootResolution()));
+        packages.addTransitive(Preconditions.checkNotNull(ctValue.getTransitivePackages()));
       }
     }
     PackageRoots packageRoots =
@@ -1221,6 +1219,7 @@ ConfiguredTarget createConfiguredTarget(
       OrderedSetMultimap<DependencyKind, ConfiguredTargetAndData> prerequisiteMap,
       ConfigConditions configConditions,
       @Nullable ToolchainCollection<ResolvedToolchainContext> toolchainContexts,
+      @Nullable NestedSet<Package> transitivePackages,
       ExecGroupCollection.Builder execGroupCollectionBuilder)
       throws InterruptedException, ActionConflictException, InvalidExecGroupException,
           AnalysisFailurePropagationException {
@@ -1239,6 +1238,7 @@ ConfiguredTarget createConfiguredTarget(
         prerequisiteMap,
         configConditions,
         toolchainContexts,
+        transitivePackages,
         execGroupCollectionBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index b588f118b8e4bb..ecb8919df464d9 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -966,8 +966,13 @@ protected boolean shouldDeleteActionNodesWhenDroppingAnalysis() {
    * If not null, this is the only source root in the build, corresponding to the single element in
    * a single-element package path. Such a single-source-root build need not plant the execroot
    * symlink forest, and can trivially resolve source artifacts from exec paths. As a consequence,
-   * builds where this is not null do not need to track a package -> source root map, and so do not
-   * need to track all loaded packages.
+   * builds where this is not null do not need to track a package -> source root map. In addition,
+   * such builds can only occur in a monorepo, and thus do not need to produce repo mapping
+   * manifests for runfiles. These two conditions together mean that such builds do not need to
+   * track all loaded packages.
+   *
+   * <p>See also {@link
+   * com.google.devtools.build.lib.analysis.ConfiguredObjectValue#getTransitivePackages}.
    */
   @Nullable
   protected Root getForcedSingleSourceRootIfNoExecrootSymlinkCreation() {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredTargetTransitivePackagesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredTargetTransitivePackagesTest.java
index d16fb3258e7843..e7ae26e8c6a192 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredTargetTransitivePackagesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredTargetTransitivePackagesTest.java
@@ -46,8 +46,7 @@ private void assertTransitiveClosureOfTargetContainsPackages(
     ConfiguredTargetValue ctValue =
         SkyframeExecutorTestUtils.getExistingConfiguredTargetValue(
             skyframeExecutor, Label.parseCanonical(target), config);
-    List<Package> transitivePackages =
-        ctValue.getTransitivePackagesForPackageRootResolution().toList();
+    List<Package> transitivePackages = ctValue.getTransitivePackages().toList();
     List<String> packageNames = Lists.transform(transitivePackages,
         new Function<Package, String>() {
           @Override