aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/objc_tools/bundlemerge
diff options
context:
space:
mode:
authorGravatar Julio Merino <jmmv@google.com>2016-02-23 12:48:41 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-02-23 13:10:16 +0000
commit7588e13b10b8a4eb36c5f8ef4354b4ac40fd9425 (patch)
treec3f4eb37393281235b57578ba9f0cbe8723f3723 /src/objc_tools/bundlemerge
parent3633955521721c06ef6c2213ab9ba73a871095e0 (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/objc_tools/bundlemerge')
-rw-r--r--src/objc_tools/bundlemerge/BUILD4
1 files changed, 2 insertions, 2 deletions
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",