Skip to content

Commit 79e2c17

Browse files
comiuscopybara-github
authored andcommitted
Rename CcInfo#transitive_native_libraries to _legacy_transitive_native_libraries
This is needed to convert CcInfo to Starlark without causing a major regression. Mark the field as legacy, because we'll need to eventually clean it up. Upgrade rules_java, that support both old and new field location. PiperOrigin-RevId: 792196604 Change-Id: I0cee6887a9adf5e91490fa8cfc58f51c63478f69
1 parent 974a7e0 commit 79e2c17

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

cc/common/cc_helper.bzl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,11 @@ def _get_dynamic_library_for_runtime_or_none(library, linking_statically):
212212

213213
def _collect_native_cc_libraries(deps, libraries):
214214
_CcNativeLibraryInfo = cc_common.get_cc_native_library_info_provider()
215-
transitive_libraries = [dep[CcInfo].transitive_native_libraries() for dep in deps if CcInfo in dep]
215+
transitive_libraries = [
216+
dep[CcInfo]._legacy_transitive_native_libraries if hasattr(dep[CcInfo], "_legacy_transitive_native_libraries") else dep[CcInfo].transitive_native_libraries()
217+
for dep in deps
218+
if CcInfo in dep
219+
]
216220
return _CcNativeLibraryInfo(libraries_to_link = depset(direct = libraries, transitive = transitive_libraries))
217221

218222
def _build_linking_context_from_libraries(ctx, libraries):

0 commit comments

Comments
 (0)