Fix codebase in preparation for incompatible_use_cc_configure_from_ru…

…les_cc

We're working on removing C++ toolchain autoconfiguration logic out of Bazel,
and moving towards using rules_cc repository for it. Some bzl files will no
longer be available through bazel/tools/cpp/*, but through
@rules_cc/cc/*.

RELNOTES: None.
PiperOrigin-RevId: 279935457

src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java

@@ -52,12 +52,12 @@ public void setup() throws Exception {
     scratch.overwriteFile(
         "/bazel_tools_workspace/tools/build_defs/cc/action_names.bzl",
         ResourceLoader.readFromResources(
-            TestConstants.BAZEL_REPO_PATH + "tools/build_defs/cc/action_names.bzl"));
+            TestConstants.RULES_CC_REPOSITORY_EXECROOT + "cc/action_names.bzl"));
 
     scratch.overwriteFile(
         "/bazel_tools_workspace/tools/cpp/cc_toolchain_config_lib.bzl",
         ResourceLoader.readFromResources(
-            TestConstants.BAZEL_REPO_PATH + "tools/cpp/cc_toolchain_config_lib.bzl"));
+            TestConstants.RULES_CC_REPOSITORY_EXECROOT + "cc/cc_toolchain_config_lib.bzl"));
     scratch.file("/ndk/source.properties", "Pkg.Desc = Android NDK", "Pkg.Revision = 13.1.3345770");
   }
 

src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java

@@ -76,7 +76,7 @@ public Path create(String relativePath, String... lines) throws IOException {
         newContent.append(System.lineSeparator());
       }
 
-      if (!newContent.toString().equals(existingContent)) {
+      if (!newContent.toString().trim().equals(existingContent.trim())) {
         throw new IOException(
             "Conflict: '"
                 + relativePath