diff options
| author |  carmi <carmi@google.com> | 2017-10-18 21:10:50 -0400 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-10-20 14:04:05 +0200 |
| commit | bdd930a57d50827d7473c442774bb02881b4be27 (patch) | |
| tree | 2f4180f0d6c0657c45209218f08b587f3bc3b12c /src/main/java/com/google/devtools/build/lib/rules/proto | |
| parent | 8ee423d9a8a85d39cfd23e43218b9fb2e5ca8f5f (diff) | |
[Bazel] Change default place where {java,cc}_proto_library look for their external repo dependencies.
This fixes https://github.com/cgrushko/proto_library/issues/4.
RELNOTES: [Bazel] {java,cc}_proto_library now look for dependencies in @com_google_protobuf, instead of in @com_google_protobuf_$LANG
PiperOrigin-RevId: 172685722
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/proto')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index c4ee406765..9df88d3f05 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -98,7 +98,7 @@ public class ProtoConfiguration extends Fragment { @Option( name = "proto_toolchain_for_java", - defaultValue = "@com_google_protobuf_java//:java_toolchain", + defaultValue = "@com_google_protobuf//:java_toolchain", category = "flags", converter = BuildConfiguration.EmptyToNullLabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, @@ -109,7 +109,7 @@ public class ProtoConfiguration extends Fragment { @Option( name = "proto_toolchain_for_cc", - defaultValue = "@com_google_protobuf_cc//:cc_toolchain", + defaultValue = "@com_google_protobuf//:cc_toolchain", category = "flags", converter = BuildConfiguration.EmptyToNullLabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, |