Internal change

- Some copybara improvements
- Fixes https://github.com/bazelbuild/bazel/issues/28271

PiperOrigin-RevId: 855674250
Change-Id: I238ff6a4888e7b78b45fdbe0a9c72671fcfd18ca

.bazelci/postsubmit.yml

diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index c4b740f..5898513 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -237,8 +237,6 @@
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     build_targets:
@@ -249,8 +247,6 @@
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     test_targets:

.bazelci/presubmit.yml

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 8d1ef3d..c690979 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -245,8 +245,6 @@
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     build_targets:
@@ -257,8 +255,6 @@
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     test_targets:

src/main/cpp/option_processor.cc

diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index 3e9f3e2..d1eeb43 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -636,7 +636,7 @@
   // Provide terminal options as least important options.
   // LINT.IfChange
   std::string terminal_rc_source = "client";
-  // LINT.ThenChange(src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
+  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
   result.push_back({terminal_rc_source, "common",
                     "--isatty=" + blaze_util::ToString(IsStandardTerminal())});
   result.push_back(
@@ -678,7 +678,7 @@
   // LINT.IfChange
   result.push_back("--rc_source=client");
   rcfile_index["client"] = 0;
-  // LINT.ThenChange(src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
+  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
   int cur_index = 1;
   for (const auto& option : blazerc_options) {
     if (rcfile_index.contains(option.source_path)) continue;

src/main/java/com/google/devtools/common/options/GlobalRcUtils.java

diff --git a/src/main/java/com/google/devtools/common/options/GlobalRcUtils.java b/src/main/java/com/google/devtools/common/options/GlobalRcUtils.java
index 5739bac..e687259 100644
--- a/src/main/java/com/google/devtools/common/options/GlobalRcUtils.java
+++ b/src/main/java/com/google/devtools/common/options/GlobalRcUtils.java
@@ -55,7 +55,7 @@
         return false;
       };
   // LINT.ThenChange(//src/main/cpp/option_processor.cc,
-  // src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
+  // //src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java)
 
   /** Is an rc file path a global rc? */
   public static boolean isGlobalRcFile(String rcFilePath) {

src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java

diff --git a/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java b/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
index f5c12a4..0cfcdf8 100644
--- a/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
+++ b/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
@@ -53,7 +53,7 @@
 
   // LINT.IfChange
   private static final String INVOCATION_POLICY_SOURCE = "Invocation policy";
-  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java, src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
+  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java, //src/main/java/com/google/devtools/common/options/GlobalRcUtils.java.oss)
   private final InvocationPolicy invocationPolicy;
   private final Level loglevel;
   @Nullable private final Object conversionContext;