Replace asserts on library_identifier with static_library
library_identifier is private and will be removed.
Works towards starlarkifying LibraryToLink structure.
PiperOrigin-RevId: 763431970
Change-Id: I5536fc0c5502674967b8b4c64278d991aa6fbf3a
diff --git a/java/testutil.bzl b/java/testutil.bzl
index 26823ba..6207583 100644
--- a/java/testutil.bzl
+++ b/java/testutil.bzl
@@ -7,10 +7,10 @@
def _cc_info_transitive_native_libraries(cc_info):
return cc_info.transitive_native_libraries()
-def _cc_library_to_link_identifier(library_to_link):
- return library_to_link.library_identifier()
+def _cc_library_to_link_static_library(library_to_link):
+ return library_to_link.static_library or library_to_link.pic_static_library
testutil = struct(
cc_info_transitive_native_libraries = _cc_info_transitive_native_libraries,
- cc_library_to_link_identifier = _cc_library_to_link_identifier,
+ cc_library_to_link_static_library = _cc_library_to_link_static_library,
)
diff --git a/test/java/common/java_info_tests.bzl b/test/java/common/java_info_tests.bzl
index 5e95187..5d3c666 100644
--- a/test/java/common/java_info_tests.bzl
+++ b/test/java/common/java_info_tests.bzl
@@ -175,7 +175,7 @@
def _with_native_libraries_test_impl(env, target):
assert_native_libs = java_info_subject.from_target(env, target).transitive_native_libraries()
- assert_native_libs.identifiers().contains_exactly_predicates([matching.str_endswith("my_cc_lib_direct")])
+ assert_native_libs.static_libraries().contains_exactly_predicates([matching.str_matches("*my_cc_lib_direct*")])
def _with_deps_and_neverlink_test(name):
target_name = name + "/my_starlark_rule"
@@ -1136,10 +1136,10 @@
def _transitive_native_libraries_test_impl(env, target):
assert_transitive_native_libraries = java_info_subject.from_target(env, target).transitive_native_libraries()
- assert_transitive_native_libraries.identifiers().contains_exactly_predicates([
- matching.str_endswith("my_cc_lib_a.so"),
- matching.str_endswith("my_cc_lib_b.so"),
- matching.str_endswith("my_cc_lib_c.so"),
+ assert_transitive_native_libraries.static_libraries().contains_exactly_predicates([
+ matching.str_matches("*my_cc_lib_a.so*"),
+ matching.str_matches("*my_cc_lib_b.so*"),
+ matching.str_matches("*my_cc_lib_c.so*"),
])
def _native_libraries_propagation_test(name):
@@ -1197,10 +1197,10 @@
def _native_libraries_propagation_test_impl(env, target):
assert_transitive_native_libraries = java_info_subject.from_target(env, target).transitive_native_libraries()
- assert_transitive_native_libraries.identifiers().contains_exactly_predicates([
- matching.str_endswith("native_rdeps1.so"),
- matching.str_endswith("native_exports1.so"),
- matching.str_endswith("native_deps1.so"),
+ assert_transitive_native_libraries.static_libraries().contains_exactly_predicates([
+ matching.str_matches("*native_rdeps1.so*"),
+ matching.str_matches("*native_exports1.so*"),
+ matching.str_matches("*native_deps1.so*"),
]).in_order()
def _annotation_processing_test(name):
diff --git a/test/java/common/rules/java_library_tests.bzl b/test/java/common/rules/java_library_tests.bzl
index 4dca71f..58a282f 100644
--- a/test/java/common/rules/java_library_tests.bzl
+++ b/test/java/common/rules/java_library_tests.bzl
@@ -273,9 +273,9 @@
def _test_propagates_direct_native_libraries_impl(env, target):
assert_transitive_native_libraries = java_info_subject.from_target(env, target).transitive_native_libraries()
- assert_transitive_native_libraries.identifiers().contains_exactly_predicates([
- matching.str_endswith("native"),
- matching.str_endswith("ccl"),
+ assert_transitive_native_libraries.static_libraries().contains_exactly_predicates([
+ matching.str_matches("*native*"),
+ matching.str_matches("*ccl*"),
]).in_order()
def _test_exposes_native_library_info(name):
diff --git a/test/java/testutil/cc_info_subject.bzl b/test/java/testutil/cc_info_subject.bzl
index c3306f6..c123c3d 100644
--- a/test/java/testutil/cc_info_subject.bzl
+++ b/test/java/testutil/cc_info_subject.bzl
@@ -60,7 +60,7 @@
meta = meta,
)
public = struct(
- identifiers = lambda: _new_library_to_link_identifiers_subject(self.actual, self.meta),
+ static_libraries = lambda: _new_library_to_link_static_libraries_subject(self.actual, self.meta),
singleton = lambda: _new_library_to_link_subject(_get_singleton(self.actual), self.meta.derive("[0]")),
)
return public
@@ -71,11 +71,11 @@
)
return public
-def _new_library_to_link_identifiers_subject(libraries_to_link, meta):
+def _new_library_to_link_static_libraries_subject(libraries_to_link, meta):
self = subjects.collection(
- [testutil.cc_library_to_link_identifier(lib) for lib in libraries_to_link],
- meta = meta.derive("library_identifier()"),
- )
+ [testutil.cc_library_to_link_static_library(lib) for lib in libraries_to_link],
+ meta = meta.derive("static_library()"),
+ ).transform(desc = "basename", map_each = lambda file: file.basename)
public = struct(
contains_exactly = lambda expected: self.contains_exactly([meta.format_str(e) for e in expected]),
contains_exactly_predicates = lambda expected: self.contains_exactly_predicates(expected),
