Add Python protobuf to Bazel third_party and move all protobuf targets into

//third_party/protobuf.

--
MOS_MIGRATED_REVID=117336377

3 files changed, 98 insertions, 26 deletions

diff --git a/third_party/BUILD b/third_party/BUILD
index 463740e67a..4d39918521 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -11,28 +11,15 @@ filegroup(
         "//third_party/java/j2objc:srcs",
         "//third_party/java/jarjar:srcs",
         "//third_party/java/jdk/langtools:srcs",
+        "//third_party/protobuf:srcs",
         "//third_party/py/concurrent:srcs",
         "//third_party/py/gflags:srcs",
         "//third_party/py/mock:srcs",
+        "//third_party/py/six:srcs",
     ],
 )
 
 filegroup(
-    name = "protoc",
-    srcs = select({
-        ":windows_mingw": ["protobuf/protoc-mingw.exe"],
-        ":windows_msys64_mingw64": ["protobuf/protoc-mingw.exe"],
-        ":windows_msys64": ["protobuf/protoc-mingw.exe"],
-        ":windows_clang": ["protobuf/protoc-mingw.exe"],
-        ":darwin": ["protobuf/protoc-osx-x86_32.exe"],
-        ":k8": ["protobuf/protoc-linux-x86_64.exe"],
-        ":piii": ["protobuf/protoc-linux-x86_32.exe"],
-        ":arm": ["protobuf/protoc-linux-arm32.exe"],
-        ":freebsd": ["protobuf/protoc-linux-x86_32.exe"],
-    }),
-)
-
-filegroup(
     name = "d3-js",
     srcs = glob(["javascript/d3/**/*.js"]),
 )
@@ -365,17 +352,6 @@ java_import(
 )
 
 java_import(
-    name = "protobuf",
-    jars = ["protobuf/protobuf-java-3.0.0-beta-1.jar"],
-)
-
-# For bootstrapping JavaBuilder
-filegroup(
-    name = "protobuf-jars",
-    srcs = ["protobuf/protobuf-java-3.0.0-beta-1.jar"],
-)
-
-java_import(
     name = "slf4j",
     jars = [
         "slf4j/slf4j-api-1.7.7.jar",
diff --git a/third_party/protobuf/BUILD b/third_party/protobuf/BUILD
new file mode 100644
index 0000000000..0e277208a2
--- /dev/null
+++ b/third_party/protobuf/BUILD
@@ -0,0 +1,81 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load("@bazel_tools//third_party/protobuf:protobuf.bzl", "py_proto_library")
+
+filegroup(
+    name = "srcs",
+    srcs = glob(
+        [
+            "**",
+            "protobuf.bzl",
+            "python/google/protobuf/**/*.py",
+            "src/google/protobuf/**/*.proto",
+        ],
+    ),
+    visibility = ["//third_party:__pkg__"],
+)
+
+filegroup(
+    name = "protoc",
+    srcs = select({
+        "//third_party:windows_mingw": ["protoc-mingw.exe"],
+        "//third_party:windows_msys64_mingw64": ["protoc-mingw.exe"],
+        "//third_party:windows_msys64": ["protoc-mingw.exe"],
+        "//third_party:windows_clang": ["protoc-mingw.exe"],
+        "//third_party:darwin": ["protoc-osx-x86_32.exe"],
+        "//third_party:k8": ["protoc-linux-x86_64.exe"],
+        "//third_party:piii": ["protoc-linux-x86_32.exe"],
+        "//third_party:arm": ["protoc-linux-arm32.exe"],
+        "//third_party:freebsd": ["protoc-linux-x86_32.exe"],
+    }),
+)
+
+java_import(
+    name = "protobuf",
+    jars = ["protobuf-java-3.0.0-beta-1.jar"],
+)
+
+# For bootstrapping JavaBuilder
+filegroup(
+    name = "protobuf-jars",
+    srcs = ["protobuf-java-3.0.0-beta-1.jar"],
+)
+
+py_library(
+    name = "protobuf_python_srcs",
+    srcs = glob(
+        [
+            "python/google/protobuf/*.py",
+            "python/google/protobuf/**/*.py",
+        ],
+    ),
+    imports = ["python"],
+)
+
+py_proto_library(
+    name = "protobuf_python",
+    srcs = [
+        "src/google/protobuf/any.proto",
+        "src/google/protobuf/api.proto",
+        "src/google/protobuf/compiler/plugin.proto",
+        "src/google/protobuf/descriptor.proto",
+        "src/google/protobuf/duration.proto",
+        "src/google/protobuf/empty.proto",
+        "src/google/protobuf/field_mask.proto",
+        "src/google/protobuf/source_context.proto",
+        "src/google/protobuf/struct.proto",
+        "src/google/protobuf/timestamp.proto",
+        "src/google/protobuf/type.proto",
+        "src/google/protobuf/wrappers.proto",
+    ],
+    include = "src",
+    default_runtime = "",
+    protoc = ":protoc",
+    py_libs = [
+        ":python_srcs",
+        "//third_party/py/six",
+    ],
+    srcs_version = "PY2AND3",
+)
diff --git a/third_party/py/six/BUILD b/third_party/py/six/BUILD
new file mode 100644
index 0000000000..39ce3a1fa8
--- /dev/null
+++ b/third_party/py/six/BUILD
@@ -0,0 +1,15 @@
+licenses(["notice"])
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+    visibility = ["//third_party:__pkg__"],
+)
+
+py_library(
+    name = "six",
+    srcs = ["six.py"],
+    imports = ["."],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+)