Rename proto dependencies to include a _java component in them.

While doing this, homogenize the two dependencies on build.proto (via
build_proto and build_proto_v2) into a single build_java_proto.

--
MOS_MIGRATED_REVID=115328219

23 files changed, 59 insertions, 64 deletions

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 22496fb5b3..0ec96ff1f2 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
@@ -51,7 +51,7 @@ java_library(
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:errorprone",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:processing",
-        "//src/main/protobuf:worker_protocol_proto",
+        "//src/main/protobuf:worker_protocol_java_proto",
         "//third_party:guava",
         "//third_party/java/jdk/langtools:javac",
     ],
@@ -98,9 +98,9 @@ bootstrap_java_library(
     ],
     neverlink_jars = ["//tools/defaults:java_langtools"],
     srcjars = [
-        "//src/main/protobuf:deps_proto_srcjar",
-        "//src/main/protobuf:worker_protocol_proto_srcjar",
-        "//src/main/protobuf:java_compilation_proto_srcjar",
+        "//src/main/protobuf:deps_java_proto_srcjar",
+        "//src/main/protobuf:worker_protocol_java_proto_srcjar",
+        "//src/main/protobuf:java_compilation_java_proto_srcjar",
     ],
 )
 
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
index 240432a9ef..7ac45260d9 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
@@ -19,7 +19,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
-        "//src/main/protobuf:java_compilation_proto",
+        "//src/main/protobuf:java_compilation_java_proto",
         "//third_party:guava",
     ],
 )
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
index 9c4178e891..c57836a16d 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
@@ -25,7 +25,7 @@ java_library(
     srcs = glob(["dependency/*.java"]),
     deps = [
         ":plugins",
-        "//src/main/protobuf:deps_proto",
+        "//src/main/protobuf:deps_java_proto",
         "//third_party:guava",
         "//third_party/java/jdk/langtools:javac",
     ],
@@ -48,7 +48,7 @@ java_library(
     srcs = glob(["processing/*.java"]),
     deps = [
         ":plugins",
-        "//src/main/protobuf:java_compilation_proto",
+        "//src/main/protobuf:java_compilation_java_proto",
         "//third_party:guava",
         "//third_party/java/jdk/langtools:javac",
     ],
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
index 83e45e9423..04419b0ad5 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
@@ -5,7 +5,7 @@ java_test(
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_options",
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:javac_turbine",
-        "//src/main/protobuf:deps_proto",
+        "//src/main/protobuf:deps_java_proto",
         "//third_party:asm",
         "//third_party:asm-util",
         "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 71c7706ff5..22da9ce254 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -386,7 +386,7 @@ java_library(
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:build_proto_v2",
+        "//src/main/protobuf:build_java_proto",
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party:protobuf",
@@ -410,7 +410,7 @@ java_library(
     deps = [
         ":concurrent",
         ":preconditions",
-        "//src/main/protobuf:build_proto_v2",
+        "//src/main/protobuf:build_java_proto",
         "//third_party:guava",
         "//third_party:protobuf",
     ],
@@ -465,8 +465,8 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:extra_actions_base_proto",
-        "//src/main/protobuf:test_status_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
+        "//src/main/protobuf:test_status_java_proto",
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party:protobuf",
@@ -515,7 +515,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules/objc",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:crosstool_config_proto",
+        "//src/main/protobuf:crosstool_config_java_proto",
         "//third_party:guava",
         "//third_party:joda_time",
         "//third_party:jsr305",
@@ -697,7 +697,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:joda_time",
         "//third_party:jsr305",
         "//third_party:protobuf",
@@ -750,8 +750,8 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:crosstool_config_java_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:jsr305",
         "//third_party:protobuf",
     ],
@@ -773,7 +773,7 @@ java_library(
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/protobuf:android_studio_ide_info_proto",
+        "//src/main/protobuf:android_studio_ide_info_java_proto",
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party:protobuf",
@@ -826,9 +826,9 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/query2:query-output",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:build_proto_v2",
-        "//src/main/protobuf:invocation_policy_proto",
-        "//src/main/protobuf:test_status_proto",
+        "//src/main/protobuf:build_java_proto",
+        "//src/main/protobuf:invocation_policy_java_proto",
+        "//src/main/protobuf:test_status_java_proto",
         "//third_party:joda_time",
         "//third_party:jsr305",
         "//third_party:protobuf",
@@ -887,7 +887,7 @@ java_library(
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/query2",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:build_proto_v2",
+        "//src/main/protobuf:build_java_proto",
     ],
 )
 
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 8758fb1ddf..10d38724a6 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -22,7 +22,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:jsr305",
         "//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 a92e7f7108..e1fe9999ba 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
@@ -9,7 +9,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:runtime",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:dash_proto",
+        "//src/main/protobuf:dash_java_proto",
         "//third_party:apache_httpclient",
         "//third_party:apache_httpcore",
         "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
index 306ef7ad65..2fac43b87b 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -33,7 +33,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:build_proto_v2",
+        "//src/main/protobuf:build_java_proto",
         "//third_party:jsr305",
     ],
 )
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 5fc0ec3378..3782226cc9 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD
@@ -17,7 +17,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:remote_protocol_proto",
+        "//src/main/protobuf:remote_protocol_java_proto",
         "//third_party:apache_httpclient",
         "//third_party:apache_httpcore",
         "//third_party:gson",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD b/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
index f3474266c8..4538e8a1fc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
@@ -22,7 +22,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:xcodegen_proto",
+        "//src/main/protobuf:xcodegen_java_proto",
         "//third_party:guava",
         "//third_party:jsr305",
     ],
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 55e93bbb0c..446c8e363d 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
@@ -24,8 +24,8 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules/apple",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:crosstool_config_java_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:jsr305",
         "//third_party:protobuf",
     ],
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
index 5879101486..2a39562aed 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
@@ -25,9 +25,9 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules/apple",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:bundlemerge_proto",
-        "//src/main/protobuf:plmerge_proto",
-        "//src/main/protobuf:xcodegen_proto",
+        "//src/main/protobuf:bundlemerge_java_proto",
+        "//src/main/protobuf:plmerge_java_proto",
+        "//src/main/protobuf:xcodegen_java_proto",
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/java/dd_plist",
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 a1beb96982..675aea900d 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/worker/BUILD
@@ -17,7 +17,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:worker_protocol_proto",
+        "//src/main/protobuf:worker_protocol_java_proto",
         "//third_party:apache_commons_pool2",
         "//third_party:guava",
         "//third_party:jsr305",
diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index 2255a27816..45cb26c6bc 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -21,15 +21,10 @@ FILES = [
 ]
 
 [java_proto_library(
-    name = s + "_proto",
+    name = s + "_java_proto",
     src = s + ".proto",
 ) for s in FILES]
 
-java_proto_library(
-    name = "build_proto_v2",
-    src = "build.proto",
-)
-
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
diff --git a/src/objc_tools/bundlemerge/BUILD b/src/objc_tools/bundlemerge/BUILD
index e5c0c47315..5d455157ac 100644
--- a/src/objc_tools/bundlemerge/BUILD
+++ b/src/objc_tools/bundlemerge/BUILD
@@ -7,7 +7,7 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":bundlemerge_lib",
-        "//src/main/protobuf:bundlemerge_proto",
+        "//src/main/protobuf:bundlemerge_java_proto",
         "//src/objc_tools/plmerge:plmerge_lib",
         "//third_party:protobuf",
     ],
@@ -19,7 +19,7 @@ java_library(
     deps = [
         "//src/java_tools/singlejar:libSingleJar",
         "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
-        "//src/main/protobuf:bundlemerge_proto",
+        "//src/main/protobuf:bundlemerge_java_proto",
         "//src/objc_tools/plmerge:plmerge_lib",
         "//src/tools/xcode-common/java/com/google/devtools/build/xcode/common",
         "//src/tools/xcode-common/java/com/google/devtools/build/xcode/zip",
diff --git a/src/objc_tools/plmerge/BUILD b/src/objc_tools/plmerge/BUILD
index 81268bc9b1..7a7225d52f 100644
--- a/src/objc_tools/plmerge/BUILD
+++ b/src/objc_tools/plmerge/BUILD
@@ -8,7 +8,7 @@ java_binary(
     deps = [
         ":plmerge_lib",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:plmerge_proto",
+        "//src/main/protobuf:plmerge_java_proto",
         "//third_party:guava",
         "//third_party/java/dd_plist",
     ],
@@ -21,7 +21,7 @@ java_library(
     ),
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:plmerge_proto",
+        "//src/main/protobuf:plmerge_java_proto",
         "//src/tools/xcode-common/java/com/google/devtools/build/xcode/common",
         "//src/tools/xcode-common/java/com/google/devtools/build/xcode/util",
         "//third_party:guava",
diff --git a/src/objc_tools/xcodegen/BUILD b/src/objc_tools/xcodegen/BUILD
index 470793671f..5893e36a98 100644
--- a/src/objc_tools/xcodegen/BUILD
+++ b/src/objc_tools/xcodegen/BUILD
@@ -8,7 +8,7 @@ java_binary(
     deps = [
         ":xcodegen_lib",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:xcodegen_proto",
+        "//src/main/protobuf:xcodegen_java_proto",
         "//third_party:guava",
         "//third_party:protobuf",
         "//third_party/java/buck-ios-support",
@@ -25,7 +25,7 @@ java_library(
         ],
     ),
     deps = [
-        "//src/main/protobuf:xcodegen_proto",
+        "//src/main/protobuf:xcodegen_java_proto",
         "//src/objc_tools/plmerge:plmerge_lib",
         "//src/tools/xcode-common/java/com/google/devtools/build/xcode/common",
         "//src/tools/xcode-common/java/com/google/devtools/build/xcode/util",
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 f268b1e0c8..c754d9ba73 100644
--- a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -4,7 +4,7 @@ java_test(
     srcs = ["PackageParserTest.java"],
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:package_manifest_proto",
+        "//src/main/protobuf:package_manifest_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android/ideinfo:package_parser_lib",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -20,7 +20,7 @@ java_test(
     srcs = ["ArtifactLocationConverterTest.java"],
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:package_manifest_proto",
+        "//src/main/protobuf:package_manifest_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android/ideinfo:package_parser_lib",
         "//third_party:guava",
         "//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/android/idlclass/BUILD b/src/test/java/com/google/devtools/build/android/idlclass/BUILD
index 3d6c4d5261..d06e046eeb 100644
--- a/src/test/java/com/google/devtools/build/android/idlclass/BUILD
+++ b/src/test/java/com/google/devtools/build/android/idlclass/BUILD
@@ -3,7 +3,7 @@ java_test(
     size = "medium",
     srcs = glob(["*.java"]),
     deps = [
-        "//src/main/protobuf:java_compilation_proto",
+        "//src/main/protobuf:java_compilation_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android/idlclass:idlclass_lib",
         "//third_party:guava",
         "//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index ff5c22a5bc..960265eb69 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -334,7 +334,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules/objc",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//src/test/java/com/google/devtools/build/skyframe:testutil",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -364,7 +364,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:io",
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -399,7 +399,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/build/lib/rules/objc",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -538,9 +538,9 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:build_proto",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:build_java_proto",
+        "//src/main/protobuf:crosstool_config_java_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -578,7 +578,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/skyframe",
-        "//src/main/protobuf:build_proto",
+        "//src/main/protobuf:build_java_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -636,7 +636,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:packages",
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/protobuf:android_studio_ide_info_proto",
+        "//src/main/protobuf:android_studio_ide_info_java_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -946,8 +946,8 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//src/main/protobuf:extra_actions_base_proto",
+        "//src/main/protobuf:crosstool_config_java_proto",
+        "//src/main/protobuf:extra_actions_base_java_proto",
         "//src/test/java/com/google/devtools/build/lib:packages_testutil",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -1018,7 +1018,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/protobuf:crosstool_config_proto",
+        "//src/main/protobuf:crosstool_config_java_proto",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
@@ -1073,8 +1073,8 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:invocation_policy_proto",
-        "//src/main/protobuf:test_status_proto",
+        "//src/main/protobuf:invocation_policy_java_proto",
+        "//src/main/protobuf:test_status_java_proto",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:mockito",
@@ -1169,7 +1169,7 @@ java_library(
     ],
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:worker_protocol_proto",
+        "//src/main/protobuf:worker_protocol_java_proto",
         "//third_party:guava",
     ],
 )
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 5a7f5d5289..094c9dc3cc 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -45,7 +45,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:package_manifest_proto",
+        "//src/main/protobuf:package_manifest_java_proto",
         "//third_party:android_common",
         "//third_party:apache_commons_compress",
         "//third_party:asm",
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 b520a81b3a..a964bf6a56 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
@@ -29,7 +29,7 @@ java_library(
     ],
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:package_manifest_proto",
+        "//src/main/protobuf:package_manifest_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
         "//third_party:guava",
         "//third_party:jsr305",
diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
index 3ff8a76912..68bf0a393f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
@@ -30,7 +30,7 @@ java_library(
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:java_compilation_proto",
+        "//src/main/protobuf:java_compilation_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
         "//third_party:guava",
         "//third_party:jsr305",