Add a Constants.TOOLS_PREFIX constant that will serve to redirect the Bazel tools repository.

This is a no-op refactoring CL. The actual switch will be made once everything passes with the new setup.

As a side cleanup, change the awkward realAndroidSdk() / realAndroidCrosstoolTop() mechanism to a converter.

--
MOS_MIGRATED_REVID=104649067

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java
index 2599cb139d..917576d879 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java
@@ -67,7 +67,7 @@ public class PythonConfigurationLoader implements ConfigurationFragmentFactory {
     }
 
     CrosstoolConfig.CToolchain toolchain = getToolchain(
-        env, buildOptions, buildOptions.get(CppOptions.class).crosstoolTop);
+        env, buildOptions, buildOptions.get(CppOptions.class).crosstoolTop());
     if (toolchain == null) {
       return null;
     }