diff options
| author |  Julio Merino <jmmv@google.com> | 2016-02-23 12:48:41 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-23 13:10:16 +0000 |
| commit | 7588e13b10b8a4eb36c5f8ef4354b4ac40fd9425 (patch) | |
| tree | c3f4eb37393281235b57578ba9f0cbe8723f3723 /src/main/java/com/google | |
| parent | 3633955521721c06ef6c2213ab9ba73a871095e0 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google')
9 files changed, 24 insertions, 24 deletions
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", |