aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-06-02 15:31:55 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-06-02 15:42:03 +0000
commitc728a631ac6ad87599270bf93a81c8d8a8c23437 (patch)
tree057d82aa0ece552b1811ac14b5799dae0ed9c6f4 /src
parent69ca96d29d277921fe6bc5b162d9358b4b91e811 (diff)
Update j2objc targets referenced by Bazel rules.
-- MOS_MIGRATED_REVID=123868341
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java3
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java
index 80b056e56b..6bacad5487 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java
@@ -85,8 +85,7 @@ public abstract class AbstractJ2ObjcProtoAspect extends NativeAspectClass
.attributeAspect("exports", this)
.attributeAspect("runtime_deps", this)
.add(attr("$protobuf_lib", LABEL)
- .value(Label.parseAbsoluteUnchecked(
- "//third_party/java/j2objc:proto_runtime_internal")))
+ .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:proto_runtime")))
.add(attr("$xcrunwrapper", LABEL).cfg(HOST).exec()
.value(Label.parseAbsoluteUnchecked(
toolsRepository + "//tools/objc:xcrunwrapper")))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java
index 35dc4542b4..f5fb4774e5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java
@@ -52,7 +52,7 @@ public class BazelJ2ObjcProtoAspect extends AbstractJ2ObjcProtoAspect {
.cfg(HOST)
.exec()
.value(Label.parseAbsoluteUnchecked(
- toolsRepository + "//third_party/java/j2objc:proto_plugin_osx")));
+ toolsRepository + "//third_party/java/j2objc:proto_plugin")));
}
@Override