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
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 f268b1e..c754d9b 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 @@
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 @@
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 3d6c4d5..d06e046 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 @@
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 ff5c22a..960265e 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 @@
"//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 @@
"//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 @@
"//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 @@
"//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 @@
"//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 @@
"//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 @@
"//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 @@
"//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 @@
"//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 @@
],
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",
],
)
