Make C++ builds work on OS X.

Fixes #538.

--
MOS_MIGRATED_REVID=106674650

3 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
index 711409aaa6..eb45c9cbd6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
@@ -12,6 +12,6 @@
 # bind(name = "android/shuffle_jars", actual = "//tools/android:shuffle_jars")
 # bind(name = "android/merge_dexzips", actual = "//tools/android:merge_dexzips")
 bind(name = "android/sdk")
-bind(name = "android/crosstool", actual = "//tools/cpp:toolchain")
+bind(name = "android/crosstool", actual = "@bazel_tools//tools/cpp:toolchain")
 bind(name = "android/appcompat_v4")
 bind(name = "android/appcompat_v7")
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkPaths.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkPaths.java
index 3e43dde1a5..40d98612bc 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkPaths.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkPaths.java
@@ -91,8 +91,7 @@ public class NdkPaths {
 
   private String createToolPath(String toolchainName, String toolName) {
 
-    String toolpathTemplate =
-        "external/%repositoryName%/ndk/toolchains/%toolchainName%/prebuilt/%hostPlatform%"
+    String toolpathTemplate = "ndk/toolchains/%toolchainName%/prebuilt/%hostPlatform%"
         + "/bin/%toolName%";
 
     return toolpathTemplate
@@ -103,7 +102,7 @@ public class NdkPaths {
   }
 
   public static String getToolchainDirectoryFromToolPath(String toolPath) {
-    return toolPath.split("/")[4];
+    return toolPath.split("/")[2];
   }
 
   String createGccToolchainPath(String toolchainName) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index 3847e26837..8ed3b21bbf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -377,7 +377,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
     this.greppedIncludesDirectory = Root.asDerivedRoot(execRoot,
         execRoot.getRelative(IncludeScanningUtil.GREPPED_INCLUDES));
 
-    this.crosstoolTopPathFragment = crosstoolTop.getPackageFragment();
+    this.crosstoolTopPathFragment = crosstoolTop.getPackageIdentifier().getPathFragment();
 
     try {
       this.staticRuntimeLibsLabel =