Rollback of commit ac6ed79e1a3fa6b0ca91657b28e2a35f7e49758c.

*** Reason for rollback ***

Roll-forward with fix

*** Original change description ***

Automated [] rollback of [].

*** Reason for rollback ***

Broke tests on Mac: https://google.com/url?sa=D&q=http%3A%2F%2Fci.bazel.io%2Fjob%2FBazel%2FJAVA_VERSION%3D1.8%2CPLATFORM_NAME%3Ddarwin-x86_64%2F269%2Fconsole

*** Original change description ***

Speed-up bootstrap on OS X by removing tool compilation.

--
MOS_MIGRATED_REVID=111833617

7 files changed, 39 insertions, 6 deletions

diff --git a/src/BUILD b/src/BUILD
index 879736d28f..2612be24cb 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -67,6 +67,25 @@ genrule(
           """,
 )
 
+filegroup(
+    name = "darwin_tools",
+    srcs = [
+        "//src/tools/xcode/actoolwrapper:actoolwrapper",
+        "//src/tools/xcode/ibtoolwrapper:ibtoolwrapper",
+        "//src/tools/xcode/momcwrapper:momcwrapper",
+        "//src/tools/xcode/swiftstdlibtoolwrapper:swiftstdlibtoolwrapper",
+        "//src/tools/xcode/environment:environment_plist",
+        "//src/tools/xcode/xcrunwrapper:xcrunwrapper",
+        "//src/objc_tools/bundlemerge:bundlemerge_deploy.jar",
+        "//src/objc_tools/plmerge:plmerge_deploy.jar",
+        "//src/objc_tools/xcodegen:xcodegen_deploy.jar",
+        "//src/tools/xcode/realpath:realpath",
+    ] + select({
+        ":iphonesdk": ["//src/tools/xcode/stdredirect:StdRedirect.dylib"],
+        "//conditions:default": [],
+    }),
+)
+
 genrule(
     name = "embedded_tools",
     srcs = [
@@ -84,7 +103,11 @@ genrule(
         "//src/java_tools/singlejar:SingleJar_deploy.jar",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
         "//third_party/ijar",
-    ],
+    ] + select({
+        ":darwin": [":darwin_tools"],
+        ":darwin_x86_64": [":darwin_tools"],
+        "//conditions:default": [],
+    }),
     outs = ["embedded_tools.zip"],
     cmd = "$(location :create_embedded_tools.sh) $@ $(SRCS)",
 )
@@ -148,6 +171,12 @@ config_setting(
 )
 
 config_setting(
+    name = "iphonesdk",
+    values = {"define": "IPHONE_SDK=1"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
     name = "freebsd",
     values = {"cpu": "freebsd"},
     visibility = ["//visibility:public"],
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 742b2ecf8d..e0faa3a1e1 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -32,6 +32,10 @@ for i in $*; do
     *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
     *ijar) OUTPUT_PATH=tools/jdk/ijar ;;
+    *src/objc_tools/*) OUTPUT_PATH=tools/objc/precomp_${i##*/} ;;
+    *xcode*StdRedirect.dylib) OUTPUT_PATH=tools/objc/StdRedirect.dylib ;;
+    *xcode*realpath) OUTPUT_PATH=tools/objc/realpath ;;
+    *src/tools/xcode/*) OUTPUT_PATH=tools/objc/${i##*/}.sh ;;
     *) OUTPUT_PATH=$(echo $i | sed 's_^.*bazel-out/[^/]*/bin/__') ;;
   esac
 
diff --git a/src/tools/xcode/actoolwrapper/BUILD b/src/tools/xcode/actoolwrapper/BUILD
index 79bfdd6eda..76c7532984 100644
--- a/src/tools/xcode/actoolwrapper/BUILD
+++ b/src/tools/xcode/actoolwrapper/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src/test:__subpackages__"])
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
diff --git a/src/tools/xcode/ibtoolwrapper/BUILD b/src/tools/xcode/ibtoolwrapper/BUILD
index 434132b366..bb00f72fa2 100644
--- a/src/tools/xcode/ibtoolwrapper/BUILD
+++ b/src/tools/xcode/ibtoolwrapper/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src/test:__subpackages__"])
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
diff --git a/src/tools/xcode/momcwrapper/BUILD b/src/tools/xcode/momcwrapper/BUILD
index 61acf80960..dd959d1019 100644
--- a/src/tools/xcode/momcwrapper/BUILD
+++ b/src/tools/xcode/momcwrapper/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src/test:__subpackages__"])
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/BUILD b/src/tools/xcode/swiftstdlibtoolwrapper/BUILD
index 1a98848a4b..ecbe656476 100644
--- a/src/tools/xcode/swiftstdlibtoolwrapper/BUILD
+++ b/src/tools/xcode/swiftstdlibtoolwrapper/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src/test:__subpackages__"])
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
diff --git a/src/tools/xcode/xcrunwrapper/BUILD b/src/tools/xcode/xcrunwrapper/BUILD
index e8ea8594a8..e3dbf20a28 100644
--- a/src/tools/xcode/xcrunwrapper/BUILD
+++ b/src/tools/xcode/xcrunwrapper/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src/test:__subpackages__"])
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",