Skip to content

Commit ec0af4a

Browse files
ted-xiecopybara-github
authored andcommitted
Merge #394 by ted-xie: Use proto files from //third_party/bazel
... instead of `@bazel_tools`. This should fix breakages with bazel at HEAD. Closes #394 COPYBARA_INTEGRATE_REVIEW=#394 from ted-xie:use_new_protos 7ee7647 PiperOrigin-RevId: 792680788 Change-Id: Idff76c73392bc3cdde51444775d9541f21cce132
1 parent 53e6807 commit ec0af4a

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

  • src/tools
    • javatests/com/google/devtools/build/android
    • java/com/google/devtools/build/android
    • jdeps/proto

src/tools/java/com/google/devtools/build/android/desugar/dependencies/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ java_library(
1818
srcs = glob(["*.java"]),
1919
deps = [
2020
"//src/tools/java/com/google/devtools/build/android/r8:deps_collector_api",
21-
"@bazel_tools//src/main/protobuf:desugar_deps_java_proto",
21+
"//third_party/bazel/src/main/protobuf:desugar_deps_java_proto",
2222
"@rules_android_maven//:com_google_code_findbugs_jsr305",
2323
"@rules_android_maven//:com_google_guava_guava",
2424
],

src/tools/java/com/google/devtools/build/android/idlclass/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ java_library(
2323
deps = [
2424
"//src/tools/java/com/google/devtools/build/android:android_builder_lib",
2525
"//src/tools/java/com/google/devtools/build/android:android_options_utils",
26-
"@bazel_tools//src/main/protobuf:java_compilation_java_proto",
26+
"//third_party/bazel/src/main/protobuf:java_compilation_java_proto",
2727
"@rules_android_maven//:com_beust_jcommander",
2828
"@rules_android_maven//:com_google_code_findbugs_jsr305",
2929
"@rules_android_maven//:com_google_guava_guava",

src/tools/javatests/com/google/devtools/build/android/desugar/dependencies/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ java_test(
2222
srcs = ["MetadataCollectorTest.java"],
2323
deps = [
2424
"//src/tools/java/com/google/devtools/build/android/desugar/dependencies",
25-
"@bazel_tools//src/main/protobuf:desugar_deps_java_proto",
25+
"//third_party/bazel/src/main/protobuf:desugar_deps_java_proto",
2626
"@rules_android_maven//:com_google_guava_guava",
2727
"@rules_android_maven//:com_google_truth_truth",
2828
"@rules_android_maven//:junit_junit",

src/tools/javatests/com/google/devtools/build/android/idlclass/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ java_test(
1818
srcs = glob(["*.java"]),
1919
deps = [
2020
"//src/tools/java/com/google/devtools/build/android/idlclass:idlclass_lib",
21-
"@bazel_tools//src/main/protobuf:java_compilation_java_proto",
21+
"//third_party/bazel/src/main/protobuf:java_compilation_java_proto",
2222
"@rules_android_maven//:com_google_guava_guava",
2323
"@rules_android_maven//:com_google_truth_truth",
2424
"@rules_android_maven//:junit_junit",

src/tools/javatests/com/google/devtools/build/android/r8/desugar/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ java_test(
3434
],
3535
deps = [
3636
"//src/tools/java/com/google/devtools/build/android/r8",
37-
"@bazel_tools//src/main/protobuf:desugar_deps_java_proto",
37+
"//third_party/bazel/src/main/protobuf:desugar_deps_java_proto",
3838
"@rules_android_maven//:com_google_guava_guava",
3939
"@rules_android_maven//:com_google_truth_truth",
4040
"@rules_android_maven//:junit_junit",

src/tools/jdeps/proto/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go_proto_library(
55
name = "deps_go_proto",
66
importpath = "src/tools/jdeps/proto/deps_go_proto",
77
protos = [
8-
"@bazel_tools//src/main/protobuf:deps_proto",
8+
"//third_party/bazel/src/main/protobuf:deps_proto",
99
],
1010
visibility = [
1111
"//src/tools/jdeps:__pkg__",

0 commit comments

Comments
 (0)