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
diff --git a/src/BUILD b/src/BUILD
index 879736d..2612be2 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -67,6 +67,25 @@
""",
)
+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 @@
"//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(
+ name = "iphonesdk",
+ values = {"define": "IPHONE_SDK=1"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
name = "freebsd",
values = {"cpu": "freebsd"},
visibility = ["//visibility:public"],
