Skip to content

Commit f0bc69c

Browse files
navidqarfacebook-github-bot
authored andcommitted
Fix references to protoc and protoc-gen-grpc-java
Summary: **Context** Replacing references to `fbsource//` targets with their counterparts in `prelude//` that exist in OSS. **This diff** - protoc - protoc-gen-grpc-java Reviewed By: IanChilds Differential Revision: D72977918 fbshipit-source-id: a999bc45acf9fdbb28cef857997a23d0ba89454f
1 parent 2534e75 commit f0bc69c

File tree

2 files changed

+58
-10
lines changed
  • prelude/toolchains/android

2 files changed

+58
-10
lines changed

Diff for: prelude/toolchains/android/third-party/BUCK

+49-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@prelude//toolchains/android/tools:build_rules.bzl", "buck_java_binary", "buck_java_library", "third_party_aar", "third_party_jar")
1+
load("@prelude//toolchains/android/tools:build_rules.bzl", "buck_java_binary", "buck_java_library", "third_party_aar", "third_party_exe", "third_party_jar")
22

33
oncall("android_devxx")
44

@@ -1059,6 +1059,54 @@ third_party_jar(
10591059
url = "mvn:com.google.protobuf:protobuf-java-util:jar:3.25.5",
10601060
visibility = ["PUBLIC"],
10611061
)
1062+
1063+
third_party_exe(
1064+
name = "protoc-linux-x86_64",
1065+
# @oss-disable[end= ]: internal_alias = "fbsource//third-party/java/com/google/protobuf/protoc:protoc-linux-x86_64",
1066+
sha1 = "9065c462198f65a0f5ab4945023dac99288cf24f",
1067+
url = "mvn:com.google.protobuf:protoc:exe:linux-x86_64:3.25.6",
1068+
visibility = ["PUBLIC"],
1069+
)
1070+
1071+
third_party_exe(
1072+
name = "protoc-osx-x86_64",
1073+
# @oss-disable[end= ]: internal_alias = "fbsource//third-party/java/com/google/protobuf/protoc:protoc-osx-x86_64",
1074+
sha1 = "a57fab7d37d8824034cc67325f81de24d0f36b6a",
1075+
url = "mvn:com.google.protobuf:protoc:exe:osx-x86_64:3.25.6",
1076+
visibility = ["PUBLIC"],
1077+
)
1078+
1079+
third_party_exe(
1080+
name = "protoc-windows-x86_64",
1081+
# @oss-disable[end= ]: internal_alias = "fbsource//third-party/java/com/google/protobuf/protoc:protoc-windows-x86_64",
1082+
sha1 = "d9bbbb5a88fc7fdcb41ff717028461f8e6b5b958",
1083+
url = "mvn:com.google.protobuf:protoc:exe:windows-x86_64:3.25.6",
1084+
visibility = ["PUBLIC"],
1085+
)
1086+
1087+
third_party_exe(
1088+
name = "protoc-gen-grpc-java-linux-x86_64",
1089+
# @oss-disable[end= ]: internal_alias = "fbsource//third-party/java/io/grpc/protoc-gen-grpc-java:protoc-gen-grpc-java-linux-x86_64",
1090+
sha1 = "3c8950cae9d5b4bed363f71118fb54bfddafcd2a",
1091+
url = "mvn:io.grpc:protoc-gen-grpc-java:exe:linux-x86_64:1.10.1",
1092+
visibility = ["PUBLIC"],
1093+
)
1094+
1095+
third_party_exe(
1096+
name = "protoc-gen-grpc-java-osx-x86_64",
1097+
# @oss-disable[end= ]: internal_alias = "fbsource//third-party/java/io/grpc/protoc-gen-grpc-java:protoc-gen-grpc-java-osx-x86_64",
1098+
sha1 = "8c37e3794df02dcb2dcc7547266119bc09d3aeae",
1099+
url = "mvn:io.grpc:protoc-gen-grpc-java:exe:osx-x86_64:1.10.1",
1100+
visibility = ["PUBLIC"],
1101+
)
1102+
1103+
third_party_exe(
1104+
name = "protoc-gen-grpc-java-windows-x86_64",
1105+
# @oss-disable[end= ]: internal_alias = "fbsource//third-party/java/io/grpc/protoc-gen-grpc-java:protoc-gen-grpc-java-windows-x86_64",
1106+
sha1 = "b5692a8df52f6aef24c7181f94240ef52b7060fb",
1107+
url = "mvn:io.grpc:protoc-gen-grpc-java:exe:windows-x86_64:1.10.1",
1108+
visibility = ["PUBLIC"],
1109+
)
10621110
# === End: protobuf
10631111

10641112
# === Begin: testng

Diff for: prelude/toolchains/android/tools/protobuf/BUCK

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
load("@fbsource//tools/build_defs:default_platform_defs.bzl", "get_host_target_platform")
1+
# @oss-disable[end= ]: load("@fbsource//tools/build_defs:default_platform_defs.bzl", "get_host_target_platform")
22
load("@prelude//toolchains/android/tools/build_rules:fb_native.bzl", "fb_native")
33

44
oncall("android_devxx")
55

66
fb_native.command_alias(
77
name = "protoc",
8-
default_target_platform = get_host_target_platform(use_minimal_xcode = False),
8+
# @oss-disable[end= ]: default_target_platform = get_host_target_platform(use_minimal_xcode = False),
99
platform_exe = {
10-
"linux": "fbsource//third-party/java/com/google/protobuf/protoc:protoc-linux-x86_64",
11-
"macos": "fbsource//third-party/java/com/google/protobuf/protoc:protoc-osx-x86_64",
12-
"windows": "fbsource//third-party/java/com/google/protobuf/protoc:protoc-windows-x86_64",
10+
"linux": "prelude//toolchains/android/third-party:protoc-linux-x86_64",
11+
"macos": "prelude//toolchains/android/third-party:protoc-osx-x86_64",
12+
"windows": "prelude//toolchains/android/third-party:protoc-windows-x86_64",
1313
},
1414
visibility = ["PUBLIC"],
1515
)
1616

1717
fb_native.command_alias(
1818
name = "gen-grpc",
19-
default_target_platform = get_host_target_platform(use_minimal_xcode = False),
19+
# @oss-disable[end= ]: default_target_platform = get_host_target_platform(use_minimal_xcode = False),
2020
platform_exe = {
21-
"linux": "fbsource//third-party/java/io/grpc/protoc-gen-grpc-java:protoc-gen-grpc-java-linux-x86_64",
22-
"macos": "fbsource//third-party/java/io/grpc/protoc-gen-grpc-java:protoc-gen-grpc-java-osx-x86_64",
21+
"linux": "prelude//toolchains/android/third-party:protoc-gen-grpc-java-linux-x86_64",
22+
"macos": "prelude//toolchains/android/third-party:protoc-gen-grpc-java-osx-x86_64",
2323
},
2424
visibility = ["PUBLIC"],
2525
)
2626

2727
fb_native.alias(
2828
name = "gen-grpc-windows",
29-
actual = "fbsource//third-party/java/io/grpc/protoc-gen-grpc-java:protoc-gen-grpc-java-windows-x86_64",
29+
actual = "prelude//toolchains/android/third-party:protoc-gen-grpc-java-windows-x86_64",
3030
visibility = ["PUBLIC"],
3131
)

0 commit comments

Comments
 (0)