Skip to content

Commit da70253

Browse files
committed
removed no longer needed grpc patches since upgrade to 1.69
1 parent 7795185 commit da70253

File tree

5 files changed

+15
-68
lines changed

5 files changed

+15
-68
lines changed

BUILD

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,24 @@ alias(
191191
"otel_sdk_rd",
192192
]]
193193

194+
# Expose the debug .pdb file
195+
[filegroup(
196+
name = otel_sdk_binary + "_dsym_file",
197+
srcs = [otel_sdk_binary],
198+
output_group = "dsyms",
199+
visibility = ["//visibility:private"],
200+
) for otel_sdk_binary in [
201+
"otel_sdk_r",
202+
"otel_sdk_d",
203+
"otel_sdk_rd",
204+
]]
205+
194206
# Import the otel_sdk.dll, and the two exposed otel_sdk.lib and otel_sdk.pdb files as one target
195207
[otel_cc_import(
196208
name = otel_sdk_binary + "_dll", #"_import",
197209
data = select({
198210
"@platforms//os:windows": [otel_sdk_binary + "_pdb_file"],
211+
"@platforms//os:macos": [otel_sdk_binary + "_dsym_file"],
199212
"//conditions:default": None,
200213
}),
201214
interface_library = otel_sdk_binary + "_lib_file",
@@ -322,12 +335,12 @@ pkg_files(
322335

323336
[run_binary(
324337
name = otel_sdk_binary + "_make_src_bundle_non_windows",
325-
srcs = [otel_sdk_binary + "_lib_file"],
338+
srcs = [otel_sdk_binary + "_dsym_file"],
326339
outs = ["lib" + otel_sdk_binary + ".src.zip"],
327340
args = [
328341
"debug-files",
329342
"bundle-sources",
330-
"$(location " + otel_sdk_binary + "_lib_file" + ")",
343+
"$(location " + otel_sdk_binary + "_dsym_file" + ")",
331344
],
332345
tags = [
333346
"manual",

MODULE.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ bazel_dep(name = "google_benchmark", version = "1.8.5")
2121
bazel_dep(name = "googletest", version = "1.15.2")
2222

2323
bazel_dep(name = "grpc", version = "1.69.0")
24-
single_version_override(
25-
module_name = "grpc",
26-
patch_strip = 1,
27-
patches = [
28-
"bazel/grpc_ares_fix.patch",
29-
],
30-
)
3124

3225
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
3326
bazel_dep(name = "platforms", version = "0.0.10")

bazel/grpc_ares_fix.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

x/MODULE.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ bazel_dep(name = "google_benchmark", version = "1.8.5")
2525
bazel_dep(name = "googletest", version = "1.15.2")
2626

2727
bazel_dep(name = "grpc", version = "1.69.0")
28-
single_version_override(
29-
module_name = "grpc",
30-
patch_strip = 1,
31-
patches = [
32-
"bazel/grpc_ares_fix.patch",
33-
],
34-
)
3528

3629
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
3730
bazel_dep(name = "platforms", version = "0.0.10")

x/bazel/grpc_ares_fix.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)