Add Python protobuf to Bazel third_party and move all protobuf targets into
//third_party/protobuf.
--
MOS_MIGRATED_REVID=117336377
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
index 76ed11c..c724c95 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
@@ -94,7 +94,7 @@
"//third_party:error_prone-jars",
"//third_party:guava-jars",
"//third_party:jsr305-jars",
- "//third_party:protobuf-jars",
+ "//third_party/protobuf:protobuf-jars",
],
neverlink_jars = ["//tools/defaults:java_langtools"],
srcjars = [
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 3473d47..10a466b 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -394,7 +394,7 @@
"//src/main/protobuf:build_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -418,7 +418,7 @@
"//src/main/protobuf:build_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -475,7 +475,7 @@
"//src/main/protobuf:test_status_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -655,7 +655,7 @@
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -678,7 +678,7 @@
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -709,7 +709,7 @@
"//src/main/protobuf:extra_actions_base_java_proto",
"//third_party:joda_time",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -740,7 +740,7 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:apk_manifest_java_proto",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -764,7 +764,7 @@
"//src/main/protobuf:crosstool_config_java_proto",
"//src/main/protobuf:extra_actions_base_java_proto",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -787,7 +787,7 @@
"//src/main/protobuf:android_studio_ide_info_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -842,7 +842,7 @@
"//src/main/protobuf:test_status_java_proto",
"//third_party:joda_time",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD
index 10d3872..e51fbea 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -24,7 +24,7 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:extra_actions_base_java_proto",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
index e1fe9999..9b8eacc 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
@@ -13,7 +13,7 @@
"//third_party:apache_httpclient",
"//third_party:apache_httpcore",
"//third_party:guava",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/remote/BUILD b/src/main/java/com/google/devtools/build/lib/remote/BUILD
index 3782226..40fd1b4 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD
@@ -23,7 +23,7 @@
"//third_party:gson",
"//third_party:guava",
"//third_party:hazelcast",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
index 446c8e3..64a0a9c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -27,7 +27,7 @@
"//src/main/protobuf:crosstool_config_java_proto",
"//src/main/protobuf:extra_actions_base_java_proto",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
index 1f43419..b6c9dde 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
@@ -23,7 +23,7 @@
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/common/options",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/worker/BUILD b/src/main/java/com/google/devtools/build/lib/worker/BUILD
index 675aea9..d735b0a 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/worker/BUILD
@@ -21,7 +21,7 @@
"//third_party:apache_commons_pool2",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index 5d275f3..979d754 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -1,6 +1,7 @@
package(default_visibility = ["//visibility:public"])
load("//tools/build_rules:genproto.bzl", "java_proto_library")
+load("@bazel_tools//third_party/protobuf:protobuf.bzl", "py_proto_library")
FILES = [
"build",
@@ -26,6 +27,13 @@
src = s + ".proto",
) for s in FILES]
+py_proto_library(
+ name = "build_pb_py",
+ srcs = ["build.proto"],
+ default_runtime = "@bazel_tools//third_party/protobuf:protobuf_python",
+ protoc = "@bazel_tools//third_party/protobuf:protoc",
+)
+
filegroup(
name = "srcs",
srcs = glob(["**"]),
diff --git a/src/objc_tools/bundlemerge/BUILD b/src/objc_tools/bundlemerge/BUILD
index 68894c6..ce0df99 100644
--- a/src/objc_tools/bundlemerge/BUILD
+++ b/src/objc_tools/bundlemerge/BUILD
@@ -9,7 +9,7 @@
":bundlemerge_lib",
"//src/main/protobuf:bundlemerge_java_proto",
"//src/objc_tools/plmerge:plmerge_lib",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
@@ -25,8 +25,8 @@
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/zip",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
"//third_party/java/dd_plist",
+ "//third_party/protobuf",
],
)
diff --git a/src/objc_tools/xcodegen/BUILD b/src/objc_tools/xcodegen/BUILD
index 32f46ab..581d924 100644
--- a/src/objc_tools/xcodegen/BUILD
+++ b/src/objc_tools/xcodegen/BUILD
@@ -10,8 +10,8 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:xcodegen_java_proto",
"//third_party:guava",
- "//third_party:protobuf",
"//third_party/java/buck-ios-support",
+ "//third_party/protobuf",
],
)
@@ -31,9 +31,9 @@
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/util",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
"//third_party/java/buck-ios-support",
"//third_party/java/dd_plist",
+ "//third_party/protobuf",
],
)
diff --git a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
index c754d9b..4bf367e 100644
--- a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -9,8 +9,8 @@
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
@@ -24,7 +24,7 @@
"//src/tools/android/java/com/google/devtools/build/android/ideinfo:package_parser_lib",
"//third_party:guava",
"//third_party:junit4",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 287a26d..954dbd7 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -546,8 +546,8 @@
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:mockito",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
@@ -583,8 +583,8 @@
"//third_party:guava-testlib",
"//third_party:jsr305",
"//third_party:junit4",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
@@ -642,8 +642,8 @@
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:mockito",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
@@ -953,8 +953,8 @@
"//third_party:guava-testlib",
"//third_party:jsr305",
"//third_party:junit4",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
@@ -996,8 +996,8 @@
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:mockito",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
@@ -1161,8 +1161,8 @@
"//src/main/java/com/google/devtools/build/lib/actions",
"//third_party:guava",
"//third_party:junit4",
- "//third_party:protobuf",
"//third_party:truth",
+ "//third_party/protobuf",
],
)
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index 15b1bb9..2efe10b 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -272,10 +272,11 @@
}
function setup_protoc_support() {
- mkdir -p third_party
- [ -e third_party/protoc ] || ln -s ${protoc_compiler} third_party/protoc
- [ -e third_party/protobuf-java.jar ] \
- || ln -s ${protoc_jar} third_party/protobuf-java.jar
+ mkdir -p third_party/protobuf
+ [ -e third_party/protobuf/protoc ] \
+ || ln -s ${protoc_compiler} third_party/protobuf/protoc
+ [ -e third_party/protobuf/protobuf-java.jar ] \
+ || ln -s ${protoc_jar} third_party/protobuf/protobuf-java.jar
cat <<EOF > third_party/BUILD
package(default_visibility = ["//visibility:public"])
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD b/src/tools/android/java/com/google/devtools/build/android/BUILD
index fda0fa7..d794f26 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -54,7 +54,7 @@
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD b/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
index e523002..c5c27e4 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -33,7 +33,7 @@
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party:protobuf",
+ "//third_party/protobuf",
],
)
