Skip to content

Commit 6e1026c

Browse files
laramielcopybara-github
authored andcommitted
update googleapis
PiperOrigin-RevId: 833851192 Change-Id: I815e5e6638082d41ca4fe832df5491d6d92ccbb5
1 parent 4670082 commit 6e1026c

File tree

4 files changed

+34
-21
lines changed

4 files changed

+34
-21
lines changed

third_party/googleapis/workspace.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def repo():
2525
maybe(
2626
third_party_http_archive,
2727
name = "googleapis",
28-
strip_prefix = "googleapis-32bc03653260356351854429bd7e2dfbf670d352",
29-
urls = mirror_url("https://github.com/googleapis/googleapis/archive/32bc03653260356351854429bd7e2dfbf670d352.tar.gz"), # master(2024-09-10)
30-
sha256 = "46ca6d9a6349c3845334dde2d55d482a11e7c1072a9085b89b6c1e94cdeb2d3e",
28+
strip_prefix = "googleapis-136201b66f70829232b7ec63fa6e35ca765bcacb",
29+
urls = mirror_url("https://github.com/googleapis/googleapis/archive/136201b66f70829232b7ec63fa6e35ca765bcacb.tar.gz"), # master(2025-11-17)
30+
sha256 = "ead761dae7673cdfc46425d22e1d2becbd4519e2a75cb78d873ec67c53c75e8b",
3131
repo_mapping = {
3232
"@com_google_googleapis_imports": "@local_proto_mirror",
3333
"@com_google_protobuf_upb": "@com_google_protobuf",

third_party/local_proto_mirror/src/imports.bzl

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Rules used by googleapis to build additional targets.
2+
# Replaces "@com_google_googleapis_imports//:imports.bzl"
3+
#
24
# See: https://github.com/googleapis/googleapis/blob/master/repository_rules.bzl
3-
45
load(
56
"@com_google_protobuf//bazel:upb_proto_library.bzl",
67
_upb_proto_library = "upb_proto_library",
@@ -15,6 +16,26 @@ load(
1516
_tensorstore_cc_proto_library = "tensorstore_cc_proto_library",
1617
)
1718

19+
#
20+
# C++
21+
#
22+
def cc_proto_library(name, deps, **kwargs):
23+
_tensorstore_cc_proto_library(name = name, deps = deps)
24+
if name.endswith("_cc_proto"):
25+
name = name[:-9]
26+
27+
# inject upb/upbdefs because CMake cannot use aspects to collect deps.
28+
_upb_proto_library(name = name + "_upb_proto", deps = deps)
29+
_upb_proto_reflection_library(name = name + "_upbdefs_proto", deps = deps)
30+
31+
cc_grpc_library = _cc_grpc_library
32+
33+
def cc_gapic_library(**kwargs):
34+
pass
35+
36+
def upb_c_proto_library(**kwargs):
37+
pass
38+
1839
#
1940
# Common
2041
#
@@ -69,6 +90,9 @@ def py_import(**kwargs):
6990
def go_proto_library(**kwargs):
7091
pass
7192

93+
def go_grpc_library(**kwargs):
94+
pass
95+
7296
def go_library(**kwargs):
7397
pass
7498

@@ -81,23 +105,6 @@ def go_gapic_library(**kwargs):
81105
def go_gapic_assembly_pkg(**kwargs):
82106
pass
83107

84-
#
85-
# C++
86-
#
87-
def cc_proto_library(name, deps, **kwargs):
88-
_tensorstore_cc_proto_library(name = name, deps = deps)
89-
if name.endswith("_cc_proto"):
90-
name = name[:-9]
91-
92-
# inject upb/upbdefs because CMake cannot use aspects to collect deps.
93-
_upb_proto_library(name = name + "_upb_proto", deps = deps)
94-
_upb_proto_reflection_library(name = name + "_upbdefs_proto", deps = deps)
95-
96-
cc_grpc_library = _cc_grpc_library
97-
98-
def cc_gapic_library(**kwargs):
99-
pass
100-
101108
#
102109
# PHP
103110
#
@@ -122,6 +129,9 @@ def nodejs_gapic_library(**kwargs):
122129
def nodejs_gapic_assembly_pkg(**kwargs):
123130
pass
124131

132+
def nodejs_gapic_combined_pkg(**kwargs):
133+
pass
134+
125135
#
126136
# Ruby
127137
#

tools/cmake/bazel_to_cmake/evaluation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,7 @@ def load_library(self, target_id: TargetId) -> Dict[str, Any]:
602602
library,
603603
f" loading library {target_id.as_label()}",
604604
)
605+
library.__target__ = target_id.as_label()
605606

606607
# Restore packages and save the library
607608
self._evaluation_context.update_current_package(*self._stack.pop())

tools/cmake/bazel_to_cmake/starlark/scope_common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ def __missing__(self, key):
4949
func = getattr(self, f'bazel_{key}')
5050
if func is not None:
5151
return func
52+
if hasattr(self, '__target__'):
53+
raise KeyError(f'{key} not found in {self.__target__}')
5254
raise KeyError
5355

5456
def bazel_Label(self, label_string: str) -> Label:

0 commit comments

Comments
 (0)