Stop bundling ijar's sources in bazel_tools

Instead bundle ijar's zipper binary so the skylark rules that depends on it
can use it from @bazel_tools.

A commit introducing windows config settings broke our appengine tutorial.

--
MOS_MIGRATED_REVID=114857080

4 files changed, 16 insertions, 25 deletions

diff --git a/tools/BUILD b/tools/BUILD
index aa30e075a7..6455ad0613 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -20,29 +20,6 @@ filegroup(
 )
 
 filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]) + [
-        "//tools/build_defs/d:srcs",
-        "//tools/build_defs/docker:srcs",
-        "//tools/build_defs/jsonnet:srcs",
-        "//tools/build_defs/pkg:srcs",
-        "//tools/build_defs/sass:srcs",
-        "//tools/build_rules/appengine:srcs",
-        "//tools/build_rules/closure:srcs",
-        "//tools/build_rules/go:srcs",
-        "//tools/build_rules/rust:srcs",
-        "//tools/buildstamp:srcs",
-        "//tools/jdk:package-srcs",
-        "//tools/genrule:srcs",
-        "//tools/cpp:srcs",
-        "//tools/j2objc:srcs",
-        "//tools/objc:srcs",
-        "//tools/test:srcs",
-        "//tools/python:srcs",
-    ],
-)
-
-filegroup(
     name = "embedded_tools_srcs",
     srcs = glob(["**"]) + [
         "//tools/android/jack:srcs",
@@ -65,5 +42,6 @@ filegroup(
         "//tools/objc:srcs",
         "//tools/python:srcs",
         "//tools/test:srcs",
+        "//tools/zip:srcs",
     ],
 )
diff --git a/tools/build_defs/groovy/groovy.bzl b/tools/build_defs/groovy/groovy.bzl
index 0766325636..0ddbbd95b0 100644
--- a/tools/build_defs/groovy/groovy.bzl
+++ b/tools/build_defs/groovy/groovy.bzl
@@ -96,7 +96,7 @@ _groovy_jar = rule(
             default = Label("//tools/defaults:jdk"),
         ),
         "_zipper": attr.label(
-            default = Label("//third_party/ijar:zipper"),
+            default = Label("@bazel_tools//tools/zip:zipper"),
             executable = True,
             single_file = True,
         ),
diff --git a/tools/build_rules/appengine/appengine.bzl b/tools/build_rules/appengine/appengine.bzl
index 2fc25facf3..1b2d631e63 100644
--- a/tools/build_rules/appengine/appengine.bzl
+++ b/tools/build_rules/appengine/appengine.bzl
@@ -192,7 +192,7 @@ appengine_war = rule(
             single_file = True,
         ),
         "_zipper": attr.label(
-            default = Label("@bazel_tools//third_party/ijar:zipper"),
+            default = Label("@bazel_tools//tools/zip:zipper"),
             single_file = True,
         ),
         "_runner_template": attr.label(
diff --git a/tools/zip/BUILD b/tools/zip/BUILD
new file mode 100644
index 0000000000..30fd8c09bc
--- /dev/null
+++ b/tools/zip/BUILD
@@ -0,0 +1,13 @@
+# Build file to expose zipper to the @bazel_tools repository.
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "srcs",
+    srcs = ["BUILD"],
+)
+
+# zipper will be added when creating the @bazel_tools repository.
+filegroup(
+    name = "zipper",
+    srcs = glob(["zipper/*"]),
+)