From 306f3d915695db6bbf167805ae5f371c0685564c Mon Sep 17 00:00:00 2001
From: Googler <hvd@google.com>
Date: Wed, 21 Feb 2024 01:05:13 -0800
Subject: [PATCH] Automated rollback of commit
 b11fa7a7c7fdb37012c7a442b16f6fdcf90b9177.

*** Reason for rollback ***

Introduces a significant memory regression by adding a new skyframe edge from every target/aspect -> RepoMapping. This is particularly wasteful internally since we don't have any external repositories.

*** Original change description ***

Emit labels in display form in Java rules

Buildozer fixes for Java strict deps violations referring to external repositories now contain labels in display form, which avoid canonical repository names that should never be added to BUILD files and aren't understood by `buildozer`.

The Starlark actions can use `Label.to_display_form()`. Java compilation actions, which are still implemented in Java, can't access the main repository mapping v...

***

PiperOrigin-RevId: 608896971
Change-Id: Ibb7860d46a13d1a5cec394473fee192e6b122e2d
---
 .../lib/analysis/AnalysisEnvironment.java     |  7 --
 .../analysis/CachingAnalysisEnvironment.java  | 12 +--
 .../build/lib/analysis/RuleContext.java       |  6 --
 .../lib/rules/java/JavaCompilationHelper.java | 33 --------
 .../rules/java/JavaCompileActionBuilder.java  | 15 ++--
 .../rules/java/JavaHeaderCompileAction.java   | 15 ++--
 .../build/lib/skyframe/AspectFunction.java    | 14 +---
 .../skyframe/ConfiguredTargetFunction.java    | 13 +--
 .../build/lib/skyframe/SkyframeBuildView.java |  7 +-
 .../builtins_bzl/common/java/android_lint.bzl |  2 +-
 .../builtins_bzl/common/java/java_common.bzl  |  2 +-
 .../java_common_internal_for_builtins.bzl     |  2 +-
 .../builtins_bzl/common/java/java_helper.bzl  | 12 ---
 .../lib/analysis/util/AnalysisTestUtil.java   | 11 ---
 .../devtools/build/lib/analysis/util/BUILD    |  1 -
 .../analysis/util/BuildViewForTesting.java    |  9 +--
 .../lib/analysis/util/BuildViewTestCase.java  | 18 +----
 .../devtools/build/lib/rules/android/BUILD    |  1 -
 .../lib/rules/android/ResourceTestBase.java   |  9 +--
 src/test/shell/bazel/BUILD                    | 16 +---
 src/test/shell/bazel/bazel_java_test.sh       | 79 -------------------
 src/test/shell/bazel/local_repository_test.sh |  2 +-
 22 files changed, 32 insertions(+), 254 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
index 50c17df23f53e8..12bab8df8168a8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
@@ -26,7 +26,6 @@
 import com.google.devtools.build.lib.actions.MiddlemanFactory;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoKey;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.skyframe.SkyFunction;
@@ -177,10 +176,4 @@ ImmutableList<Artifact> getBuildInfo(
   ImmutableSet<Artifact> getTreeArtifactsConflictingWithFiles();
 
   ActionKeyContext getActionKeyContext();
-
-  /**
-   * The repository mapping applicable to the main repository. This is purely meant to support
-   * {@link com.google.devtools.build.lib.cmdline.Label#getDisplayForm()}.
-   */
-  RepositoryMapping getMainRepoMapping();
 }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
index 633ef39e220fc6..d9c9d5d171ffbb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
@@ -30,7 +30,6 @@
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoCollection;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoKey;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.packages.Target;
@@ -89,8 +88,6 @@ public final class CachingAnalysisEnvironment implements AnalysisEnvironment {
    */
   private final List<ActionAnalysisMetadata> actions = new ArrayList<>();
 
-  private final RepositoryMapping mainRepoMapping;
-
   public CachingAnalysisEnvironment(
       ArtifactFactory artifactFactory,
       ActionKeyContext actionKeyContext,
@@ -99,8 +96,7 @@ public CachingAnalysisEnvironment(
       boolean allowAnalysisFailures,
       ExtendedEventHandler errorEventListener,
       SkyFunction.Environment env,
-      StarlarkBuiltinsValue starlarkBuiltinsValue,
-      RepositoryMapping mainRepoMapping) {
+      StarlarkBuiltinsValue starlarkBuiltinsValue) {
     this.artifactFactory = artifactFactory;
     this.actionKeyContext = actionKeyContext;
     this.owner = Preconditions.checkNotNull(owner);
@@ -109,7 +105,6 @@ public CachingAnalysisEnvironment(
     this.errorEventListener = errorEventListener;
     this.skyframeEnv = env;
     this.starlarkBuiltinsValue = starlarkBuiltinsValue;
-    this.mainRepoMapping = mainRepoMapping;
     middlemanFactory = new MiddlemanFactory(artifactFactory, this);
   }
 
@@ -236,11 +231,6 @@ public ActionKeyContext getActionKeyContext() {
     return actionKeyContext;
   }
 
-  @Override
-  public RepositoryMapping getMainRepoMapping() {
-    return mainRepoMapping;
-  }
-
   @Override
   public boolean hasErrors() {
     Preconditions.checkState(enabled);
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 400ffc4a8557fe..ecb5c28e176382 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
@@ -57,7 +57,6 @@
 import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext;
 import com.google.devtools.build.lib.analysis.stringtemplate.TemplateContext;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.ImmutableSortedKeyListMultimap;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -328,11 +327,6 @@ public String getWorkspaceName() {
     return rule.getPackage().getWorkspaceName();
   }
 
-  /** Returns the repository mapping of the main repository. */
-  public RepositoryMapping getMainRepoMapping() {
-    return getAnalysisEnvironment().getMainRepoMapping();
-  }
-
   /** The configuration conditions that trigger this rule's configurable attributes. */
   public ImmutableMap<Label, ConfigMatchingProvider> getConfigConditions() {
     return configConditions;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
index 303d170367c138..2ea7ca146d3649 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -16,8 +16,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.devtools.build.lib.packages.ExecGroup.DEFAULT_EXEC_GROUP_NAME;
 
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -25,8 +23,6 @@
 import com.google.common.collect.Interner;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.CommandLineItem;
-import com.google.devtools.build.lib.actions.CommandLineItem.ExceptionlessMapFn;
 import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.actions.ParamFileInfo;
 import com.google.devtools.build.lib.actions.ParameterFile;
@@ -42,7 +38,6 @@
 import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.StrictDepsMode;
 import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 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;
@@ -55,7 +50,6 @@
 import com.google.devtools.build.lib.rules.java.JavaToolchainProvider.JspecifyInfo;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.PathFragment;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -69,33 +63,6 @@
  */
 public final class JavaCompilationHelper {
 
-  /**
-   * Cache for the {@link com.google.devtools.build.lib.actions.CommandLineItem.MapFn} that turns a
-   * {@link Label} into its possibly @-prefixed display form, which requires the repository mapping
-   * of the main repo.
-   *
-   * <p>The capacity of this cache after weakly reachable object have been cleaned will always be 1
-   * as there is only a single main repo mapping in a given build.
-   */
-  static final LoadingCache<RepositoryMapping, CommandLineItem.ExceptionlessMapFn<Label>>
-      TARGET_LABEL_MAP_FN_CACHE =
-          Caffeine.newBuilder()
-              .initialCapacity(1)
-              .weakKeys()
-              .build(
-                  mainRepoMapping ->
-                      (ExceptionlessMapFn<Label> & Serializable)
-                          (label, args) -> {
-                            String displayForm = label.getDisplayForm(mainRepoMapping);
-                            if (displayForm.startsWith("@")) {
-                              // @-prefixed strings will be assumed to be filenames and expanded by
-                              // {@link JavaLibraryBuildRequest}, so add an extra &at; to escape it.
-                              args.accept("@" + displayForm);
-                            } else {
-                              args.accept(displayForm);
-                            }
-                          });
-
   private static final Interner<ImmutableList<String>> javacOptsInterner =
       BlazeInterners.newWeakInterner();
   private static final Interner<ImmutableMap<String, String>> executionInfoInterner =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java
index c195b4d2ac2461..2237d1b703f757 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java
@@ -28,7 +28,6 @@
 import com.google.devtools.build.lib.actions.extra.JavaCompileInfo;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
-import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg;
 import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.StrictDepsMode;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -314,12 +313,14 @@ private CustomCommandLine buildParamFileContents(ImmutableList<String> javacOpts
       result.add("--");
     }
     if (targetLabel != null) {
-      result.addAll(
-          "--target_label",
-          VectorArg.of(ImmutableList.of(targetLabel))
-              .mapped(
-                  JavaCompilationHelper.TARGET_LABEL_MAP_FN_CACHE.get(
-                      ruleContext.getMainRepoMapping())));
+      result.add("--target_label");
+      if (targetLabel.getRepository().isMain()) {
+        result.addLabel(targetLabel);
+      } else {
+        // @-prefixed strings will be assumed to be filenames and expanded by
+        // {@link JavaLibraryBuildRequest}, so add an extra &at; to escape it.
+        result.addPrefixedLabel("@", targetLabel);
+      }
     }
     result.add("--injecting_rule_kind", injectingRuleKind);
     // strict_java_deps controls whether the mapping from jars to targets is
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
index 1970a4fdadf8c2..50194c94c22048 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
@@ -40,7 +40,6 @@
 import com.google.devtools.build.lib.actions.SpawnResult;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
-import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg;
 import com.google.devtools.build.lib.analysis.actions.PathMappers;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.StrictDepsMode;
@@ -444,12 +443,14 @@ public void build(JavaToolchainProvider javaToolchain) throws RuleErrorException
       }
 
       if (targetLabel != null) {
-        commandLine.addAll(
-            "--target_label",
-            VectorArg.of(ImmutableList.of(targetLabel))
-                .mapped(
-                    JavaCompilationHelper.TARGET_LABEL_MAP_FN_CACHE.get(
-                        ruleContext.getMainRepoMapping())));
+        commandLine.add("--target_label");
+        if (targetLabel.getRepository().isMain()) {
+          commandLine.addLabel(targetLabel);
+        } else {
+          // @-prefixed strings will be assumed to be params filenames and expanded,
+          // so add an extra @ to escape it.
+          commandLine.addPrefixedLabel("@", targetLabel);
+        }
       }
 
       ImmutableMap<String, String> executionInfo =
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 1068540307e468..d66602cfcadf20 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
@@ -56,7 +56,6 @@
 import com.google.devtools.build.lib.causes.LabelCause;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.events.Event;
@@ -757,23 +756,12 @@ private AspectValue createAspect(
     if (env.valuesMissing()) {
       return null;
     }
-    RepositoryMappingValue mainRepoMappingValue =
-        (RepositoryMappingValue) env.getValue(RepositoryMappingValue.key(RepositoryName.MAIN));
-    if (mainRepoMappingValue == null) {
-      return null;
-    }
 
     SkyframeBuildView view = buildViewProvider.getSkyframeBuildView();
 
     StoredEventHandler events = new StoredEventHandler();
     CachingAnalysisEnvironment analysisEnvironment =
-        view.createAnalysisEnvironment(
-            key,
-            events,
-            env,
-            configuration,
-            starlarkBuiltinsValue,
-            mainRepoMappingValue.getRepositoryMapping());
+        view.createAnalysisEnvironment(key, events, env, configuration, starlarkBuiltinsValue);
 
     ConfiguredAspect configuredAspect;
     if (aspect.getDefinition().applyToGeneratingRules() && associatedTarget instanceof OutputFile) {
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 38099c0f3f7562..9d79bd64d762a1 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
@@ -45,7 +45,6 @@
 import com.google.devtools.build.lib.causes.AnalysisFailedCause;
 import com.google.devtools.build.lib.causes.Cause;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.RepositoryName;
 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;
@@ -373,21 +372,11 @@ private static ConfiguredTargetValue createConfiguredTarget(
     if (starlarkBuiltinsValue == null) {
       return null;
     }
-    RepositoryMappingValue mainRepoMappingValue =
-        (RepositoryMappingValue) env.getValue(RepositoryMappingValue.key(RepositoryName.MAIN));
-    if (mainRepoMappingValue == null) {
-      return null;
-    }
 
     StoredEventHandler events = new StoredEventHandler();
     CachingAnalysisEnvironment analysisEnvironment =
         view.createAnalysisEnvironment(
-            configuredTargetKey,
-            events,
-            env,
-            configuration,
-            starlarkBuiltinsValue,
-            mainRepoMappingValue.getRepositoryMapping());
+            configuredTargetKey, events, env, configuration, starlarkBuiltinsValue);
 
     Preconditions.checkNotNull(depValueMap);
     ConfiguredTarget configuredTarget;
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 ba1fbbc075ca7a..97c2d8ac388936 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
@@ -75,7 +75,6 @@
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildMetrics.BuildGraphMetrics;
 import com.google.devtools.build.lib.causes.AnalysisFailedCause;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 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;
@@ -1271,8 +1270,7 @@ CachingAnalysisEnvironment createAnalysisEnvironment(
       ExtendedEventHandler eventHandler,
       Environment env,
       BuildConfigurationValue config,
-      StarlarkBuiltinsValue starlarkBuiltinsValue,
-      RepositoryMapping mainRepoMapping) {
+      StarlarkBuiltinsValue starlarkBuiltinsValue) {
     boolean extendedSanityChecks = config != null && config.extendedSanityChecks();
     boolean allowAnalysisFailures = config != null && config.allowAnalysisFailures();
     return new CachingAnalysisEnvironment(
@@ -1283,8 +1281,7 @@ CachingAnalysisEnvironment createAnalysisEnvironment(
         allowAnalysisFailures,
         eventHandler,
         env,
-        starlarkBuiltinsValue,
-        mainRepoMapping);
+        starlarkBuiltinsValue);
   }
 
   /**
diff --git a/src/main/starlark/builtins_bzl/common/java/android_lint.bzl b/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
index 581583a1e9faf9..3533c37cb79765 100644
--- a/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
@@ -93,7 +93,7 @@ def android_lint_action(ctx, source_files, source_jars, compilation_info):
     args.add_all("--bootclasspath", bootclasspath)
     args.add_all("--classpath", classpath)
     args.add_all("--lint_rules", compilation_info.plugins.processor_jars)
-    args.add_all("--target_label", [ctx.label], map_each = helper.map_to_display_form)
+    args.add("--target_label", ctx.label)
 
     javac_opts = compilation_info.javac_options
     if (javac_opts):
diff --git a/src/main/starlark/builtins_bzl/common/java/java_common.bzl b/src/main/starlark/builtins_bzl/common/java/java_common.bzl
index 741b41115d5fc7..4620396a59b729 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_common.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_common.bzl
@@ -120,7 +120,7 @@ def _stamp_jar(actions, jar, java_toolchain, target_label):
     args.add(jar)
     args.add(output)
     args.add("--nostrip_jar")
-    args.add_all("--target_label", [target_label], map_each = helper.map_to_display_form)
+    args.add("--target_label", target_label)
     actions.run(
         mnemonic = "JavaIjar",
         inputs = [jar],
diff --git a/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl b/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl
index 616c76a8d725b1..08a5be5c788fdb 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl
@@ -396,7 +396,7 @@ def run_ijar(
     args.add(jar)
     args.add(output)
     if target_label != None:
-        args.add_all("--target_label", [target_label], map_each = helper.map_to_display_form)
+        args.add("--target_label", target_label)
     if injecting_rule_kind != None:
         args.add("--injecting_rule_kind", injecting_rule_kind)
 
diff --git a/src/main/starlark/builtins_bzl/common/java/java_helper.bzl b/src/main/starlark/builtins_bzl/common/java/java_helper.bzl
index 99c91ac9b85895..b0fa94626f4f98 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_helper.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_helper.bzl
@@ -444,17 +444,6 @@ def _derive_output_file(ctx, base_file, *, name_suffix = "", extension = None, e
     new_basename = paths.replace_extension(base_file.basename, name_suffix + "." + extension + extension_suffix)
     return ctx.actions.declare_file(new_basename, sibling = base_file)
 
-def _map_to_display_form(label):
-    """`map_each` callback that formats a `Label` with `Label.to_display_form()`
-
-    Args:
-        label: (Label) the label of a target.
-
-    Returns:
-        (str) the display form representation of `label`
-    """
-    return label.to_display_form()
-
 helper = struct(
     collect_all_targets_as_deps = _collect_all_targets_as_deps,
     filter_launcher_for_target = _filter_launcher_for_target,
@@ -481,5 +470,4 @@ helper = struct(
     tokenize_javacopts = _tokenize_javacopts,
     detokenize_javacopts = _detokenize_javacopts,
     derive_output_file = _derive_output_file,
-    map_to_display_form = _map_to_display_form,
 )
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 45b4ef918be0bc..a892023d0a4e31 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -50,7 +50,6 @@
 import com.google.devtools.build.lib.analysis.config.BuildOptionsView;
 import com.google.devtools.build.lib.analysis.config.ExecutionTransitionFactory;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -234,11 +233,6 @@ public ImmutableSet<Artifact> getTreeArtifactsConflictingWithFiles() {
     public ActionKeyContext getActionKeyContext() {
       return original.getActionKeyContext();
     }
-
-    @Override
-    public RepositoryMapping getMainRepoMapping() {
-      return original.getMainRepoMapping();
-    }
   }
 
   /** A dummy WorkspaceStatusAction. */
@@ -475,11 +469,6 @@ public ImmutableSet<Artifact> getTreeArtifactsConflictingWithFiles() {
     public ActionKeyContext getActionKeyContext() {
       return null;
     }
-
-    @Override
-    public RepositoryMapping getMainRepoMapping() {
-      throw new UnsupportedOperationException();
-    }
   }
 
   /** Matches the output path prefix contributed by a C++ configuration fragment. */
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
index 773136bd397e50..f37bec15129e7f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
@@ -107,7 +107,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe:diff_awareness",
         "//src/main/java/com/google/devtools/build/lib/skyframe:package_roots_no_symlink_creation",
         "//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:repository_mapping_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
         "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
         "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_executor_repository_helpers_holder",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
index 043d134a6203d1..ae8a327c634475 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
@@ -58,7 +58,6 @@
 import com.google.devtools.build.lib.analysis.test.CoverageReportActionFactory;
 import com.google.devtools.build.lib.bugreport.BugReporter;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible;
@@ -78,7 +77,6 @@
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetEvaluationExceptions.UnreportedException;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.skyframe.DependencyResolver;
-import com.google.devtools.build.lib.skyframe.RepositoryMappingValue;
 import com.google.devtools.build.lib.skyframe.SkyFunctionEnvironmentForTesting;
 import com.google.devtools.build.lib.skyframe.SkyFunctions;
 import com.google.devtools.build.lib.skyframe.SkyframeBuildView;
@@ -350,10 +348,6 @@ public RuleContext getRuleContextForTesting(
     StarlarkBuiltinsValue starlarkBuiltinsValue =
         (StarlarkBuiltinsValue)
             Preconditions.checkNotNull(skyframeEnv.getValue(StarlarkBuiltinsValue.key()));
-    RepositoryMappingValue mainRepoMappingValue =
-        (RepositoryMappingValue)
-            Preconditions.checkNotNull(
-                skyframeEnv.getValue(RepositoryMappingValue.key(RepositoryName.MAIN)));
     CachingAnalysisEnvironment analysisEnv =
         new CachingAnalysisEnvironment(
             getArtifactFactory(),
@@ -366,8 +360,7 @@ public RuleContext getRuleContextForTesting(
             targetConfig.allowAnalysisFailures(),
             eventHandler,
             skyframeEnv,
-            starlarkBuiltinsValue,
-            mainRepoMappingValue.getRepositoryMapping());
+            starlarkBuiltinsValue);
     return getRuleContextForTesting(eventHandler, target, analysisEnv);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 6c8dbba17bcb34..f3d92c2f087341 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -114,7 +114,6 @@
 import com.google.devtools.build.lib.cmdline.LabelConstants;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -159,7 +158,6 @@
 import com.google.devtools.build.lib.skyframe.PackageFunction;
 import com.google.devtools.build.lib.skyframe.PackageRootsNoSymlinkCreation;
 import com.google.devtools.build.lib.skyframe.PrecomputedValue;
-import com.google.devtools.build.lib.skyframe.RepositoryMappingValue;
 import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
 import com.google.devtools.build.lib.skyframe.SkyFunctionEnvironmentForTesting;
 import com.google.devtools.build.lib.skyframe.SkyFunctions;
@@ -671,10 +669,6 @@ protected CachingAnalysisEnvironment getTestAnalysisEnvironment() throws Interru
     StarlarkBuiltinsValue starlarkBuiltinsValue =
         (StarlarkBuiltinsValue)
             Preconditions.checkNotNull(env.getValue(StarlarkBuiltinsValue.key()));
-    RepositoryMappingValue mainRepoMappingValue =
-        (RepositoryMappingValue)
-            Preconditions.checkNotNull(
-                env.getValue(RepositoryMappingValue.key(RepositoryName.MAIN)));
     return new CachingAnalysisEnvironment(
         view.getArtifactFactory(),
         actionKeyContext,
@@ -696,12 +690,11 @@ public SkyFunctionName functionName() {
             return null;
           }
         },
-        /* extendedSanityChecks= */ false,
-        /* allowAnalysisFailures= */ false,
+        /*extendedSanityChecks=*/ false,
+        /*allowAnalysisFailures=*/ false,
         reporter,
         env,
-        starlarkBuiltinsValue,
-        mainRepoMappingValue.getRepositoryMapping());
+        starlarkBuiltinsValue);
   }
 
   /**
@@ -2333,11 +2326,6 @@ public ImmutableSet<Artifact> getTreeArtifactsConflictingWithFiles() {
     public ActionKeyContext getActionKeyContext() {
       return actionKeyContext;
     }
-
-    @Override
-    public RepositoryMapping getMainRepoMapping() {
-      throw new UnsupportedOperationException();
-    }
   }
 
   protected Iterable<String> baselineCoverageArtifactBasenames(ConfiguredTarget target)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
index 3fa38cc8dbe811..25e199f9474c05 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
@@ -216,7 +216,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/events",
         "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:repository_mapping_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:starlark_builtins_value",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
index 73248925bcb23c..08c2004c355a02 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
@@ -31,12 +31,10 @@
 import com.google.devtools.build.lib.analysis.RuleErrorConsumer;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
-import com.google.devtools.build.lib.skyframe.RepositoryMappingValue;
 import com.google.devtools.build.lib.skyframe.SkyFunctionEnvironmentForTesting;
 import com.google.devtools.build.lib.skyframe.StarlarkBuiltinsValue;
 import com.google.devtools.build.lib.vfs.DigestHashFunction;
@@ -232,10 +230,6 @@ public RuleContext getRuleContextForActionTesting(ConfiguredTarget dummyTarget)
     StarlarkBuiltinsValue starlarkBuiltinsValue =
         (StarlarkBuiltinsValue)
             Preconditions.checkNotNull(skyframeEnv.getValue(StarlarkBuiltinsValue.key()));
-    RepositoryMappingValue mainRepoMappingValue =
-        (RepositoryMappingValue)
-            Preconditions.checkNotNull(
-                skyframeEnv.getValue(RepositoryMappingValue.key(RepositoryName.MAIN)));
     CachingAnalysisEnvironment analysisEnv =
         new CachingAnalysisEnvironment(
             view.getArtifactFactory(),
@@ -248,8 +242,7 @@ public RuleContext getRuleContextForActionTesting(ConfiguredTarget dummyTarget)
             targetConfig.allowAnalysisFailures(),
             eventHandler,
             skyframeEnv,
-            starlarkBuiltinsValue,
-            mainRepoMappingValue.getRepositoryMapping());
+            starlarkBuiltinsValue);
 
     return view.getRuleContextForTesting(eventHandler, dummyTarget, analysisEnv);
   }
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 6606a919645036..b7d442cec4cc05 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -259,10 +259,6 @@ sh_test(
         "@bazel_tools//tools/bash/runfiles",
     ],
     exec_compatible_with = ["//:highcpu_machine"],
-    tags = [
-        # bzlmod usage requires network
-        "requires-network",
-    ],
 )
 
 JAVA_VERSIONS = ("11", "17")
@@ -292,10 +288,6 @@ JAVA_VERSIONS_COVERAGE = ("11", "17")
             "@bazel_tools//tools/bash/runfiles",
         ],
         exec_compatible_with = ["//:highcpu_machine"],
-        tags = [
-            # bzlmod usage requires network
-            "requires-network",
-        ],
     )
     for java_version in JAVA_VERSIONS
 ]
@@ -320,12 +312,8 @@ JAVA_VERSIONS_COVERAGE = ("11", "17")
             ":test-deps",
             "@bazel_tools//tools/bash/runfiles",
         ],
-        tags = [
-            # This test is only run by the java_tools binaries pipeline.
-            "manual",
-            # bzlmod usage requires network
-            "requires-network",
-        ],
+        # This test is only run by the java_tools binaries pipeline.
+        tags = ["manual"],
     )
     for java_version in JAVA_VERSIONS
 ]
diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
index d1934d0c845678..83cd617fbc1b07 100755
--- a/src/test/shell/bazel/bazel_java_test.sh
+++ b/src/test/shell/bazel/bazel_java_test.sh
@@ -1949,83 +1949,4 @@ EOF
   bazel build //pkg:a >& $TEST_log || fail "build failed"
 }
 
-function test_strict_deps_error_external_repo_native_action() {
-  cat << 'EOF' > MODULE.bazel
-bazel_dep(
-    name = "lib_c",
-    repo_name = "c",
-)
-local_path_override(
-    module_name = "lib_c",
-    path = "lib_c",
-)
-EOF
-
-  mkdir -p pkg
-  cat << 'EOF' > pkg/BUILD
-java_library(name = "a", srcs = ["A.java"], deps = [":b"])
-java_library(name = "b", srcs = ["B.java"], deps = ["@c"])
-EOF
-  cat << 'EOF' > pkg/A.java
-public class A extends B implements C {}
-EOF
-  cat << 'EOF' > pkg/B.java
-public class B implements C {}
-EOF
-
-  mkdir -p lib_c
-  cat << 'EOF' > lib_c/MODULE.bazel
-module(name = "lib_c")
-EOF
-  cat << 'EOF' > lib_c/BUILD
-java_library(name = "c", srcs = ["C.java"], visibility = ["//visibility:public"])
-EOF
-  cat << 'EOF' > lib_c/C.java
-public interface C {}
-EOF
-
-  bazel build //pkg:a >& $TEST_log && fail "build should fail"
-  expect_log "buildozer 'add deps @c//:c' //pkg:a"
-}
-
-function test_strict_deps_error_external_repo_starlark_action() {
-  cat << 'EOF' > MODULE.bazel
-bazel_dep(
-    name = "lib_c",
-    repo_name = "c",
-)
-local_path_override(
-    module_name = "lib_c",
-    path = "lib_c",
-)
-EOF
-
-  mkdir -p pkg
-  cat << 'EOF' > pkg/BUILD
-java_library(name = "a", srcs = ["A.java"], deps = [":b"])
-java_library(name = "b", srcs = ["B.java"], deps = ["@c"])
-EOF
-  cat << 'EOF' > pkg/A.java
-public class A extends B implements C {}
-EOF
-  cat << 'EOF' > pkg/B.java
-public class B implements C {}
-EOF
-
-  mkdir -p lib_c
-  cat << 'EOF' > lib_c/MODULE.bazel
-module(name = "lib_c")
-EOF
-  cat << 'EOF' > lib_c/BUILD
-java_library(name = "c_pregen", srcs = ["C.java"])
-java_import(name = "c", jars = ["libc_pregen.jar"], visibility = ["//visibility:public"])
-EOF
-  cat << 'EOF' > lib_c/C.java
-public interface C {}
-EOF
-
-  bazel build //pkg:a >& $TEST_log && fail "build should fail"
-  expect_log "buildozer 'add deps @c//:c' //pkg:a"
-}
-
 run_suite "Java integration tests"
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index e57d96531ef4f3..3ee5332a0a1792 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -1367,7 +1367,7 @@ EOF
 
   bazel build @x_repo//a >& $TEST_log && fail "Building @x_repo//a should error out"
   expect_log "** Please add the following dependencies:"
-  expect_log " @x_repo//x to @x_repo//a"
+  expect_log "@@x_repo//x to @@x_repo//a"
 }
 
 # This test verifies that the `public` pattern includes external dependencies.