Remove dependency on builtins-internal symbol `CcNativeLibraryInfo` from `java_info.bzl` PiperOrigin-RevId: 685676319 Change-Id: I9b93b2d61c78f21cbd593d5ceba36aa2a9016091
diff --git a/src/main/starlark/builtins_bzl/common/java/java_info.bzl b/src/main/starlark/builtins_bzl/common/java/java_info.bzl index ecf8ffc..4591998 100644 --- a/src/main/starlark/builtins_bzl/common/java/java_info.bzl +++ b/src/main/starlark/builtins_bzl/common/java/java_info.bzl
@@ -16,7 +16,7 @@ Definition of JavaInfo and JavaPluginInfo provider. """ -load(":common/cc/cc_common.bzl", "CcNativeLibraryInfo", "cc_common") +load(":common/cc/cc_common.bzl", "cc_common") load(":common/cc/cc_info.bzl", "CcInfo") load(":common/java/java_semantics.bzl", "semantics") @@ -173,7 +173,7 @@ } if _java_common_internal._google_legacy_api_enabled(): - cc_info = _minimize_cc_info(cc_common.merge_cc_infos(cc_infos = [p.cc_link_params_info for p in providers])) + cc_info = semantics.minimize_cc_info(cc_common.merge_cc_infos(cc_infos = [p.cc_link_params_info for p in providers])) result.update( cc_link_params_info = cc_info, transitive_native_libraries = cc_info.transitive_native_libraries(), @@ -498,13 +498,6 @@ def _validate_provider_list(provider_list, what, expected_provider_type): _java_common_internal.check_provider_instances(provider_list, what, expected_provider_type) -def _minimize_cc_info(cc_info): - return CcInfo( - linking_context = cc_info.linking_context, - cc_native_library_info = CcNativeLibraryInfo(libraries_to_link = cc_info.transitive_native_libraries()), - debug_context = cc_info.debug_context(), - ) - def _compute_concatenated_deps(deps, runtime_deps, exports): deps_exports = [] deps_exports.extend(deps) @@ -634,7 +627,7 @@ if _java_common_internal._google_legacy_api_enabled(): transitive_cc_infos = [dep.cc_link_params_info for dep in concatenated_deps.runtimedeps_exports_deps] transitive_cc_infos.extend(native_libraries) - cc_info = _minimize_cc_info(cc_common.merge_cc_infos(cc_infos = transitive_cc_infos)) + cc_info = semantics.minimize_cc_info(cc_common.merge_cc_infos(cc_infos = transitive_cc_infos)) result.update( cc_link_params_info = cc_info, transitive_native_libraries = cc_info.transitive_native_libraries(),
diff --git a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl index 95c10b0..73c10ef 100644 --- a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl +++ b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
@@ -40,6 +40,9 @@ def _check_java_info_opens_exports(): pass +def _minimize_cc_info(cc_info): + return cc_info + _DOCS = struct( ATTRS = { "resources": """ @@ -104,4 +107,5 @@ DOCS = struct( for_attribute = lambda name: _DOCS.ATTRS.get(name, ""), ), + minimize_cc_info = _minimize_cc_info, )