Skip to content

Commit

Permalink
Rename proto dependencies to include a _java component in them.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@jmmv @damienmg
jmmv authored and damienmg committed Feb 23, 2016
1 parent 3633955 commit 7588e13
Show file tree
Hide file tree
Showing 23 changed files with 59 additions and 64 deletions.
8 changes: 4 additions & 4 deletions src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
4 changes: 2 additions & 2 deletions src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/com/google/devtools/build/lib/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/actions/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/query2/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/remote/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/worker/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 1 addition & 6 deletions src/main/protobuf/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(["**"]),
Expand Down
4 changes: 2 additions & 2 deletions src/objc_tools/bundlemerge/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/objc_tools/plmerge/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/objc_tools/xcodegen/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/google/devtools/build/android/ideinfo/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/google/devtools/build/android/idlclass/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 7588e13

Please sign in to comment.