Maybe more

Author: Bencodes

src/test/starlark/internal/jvm/native_libraries_tests.bzl

@@ -1,4 +1,4 @@
-load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 load("@rules_java//java:defs.bzl", "JavaInfo")
 load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
 load("@rules_testing//lib:test_suite.bzl", "test_suite")
@@ -28,6 +28,16 @@ def _native_library_basenames(java_info):
     return basenames
 
 def _native_library_target(name, suffix):
+    # Analysis tests only need CcInfo propagation, and cc_library matches the
+    # rules_java fixture shape more reliably across platforms than linkshared binaries.
+    util.helper_target(
+        cc_library,
+        name = name + "/" + suffix,
+        srcs = [util.empty_file(name + "_" + suffix + ".cc")],
+    )
+    return name + "/" + suffix
+
+def _native_shared_library_target(name, suffix):
     util.helper_target(
         cc_binary,
         name = name + "/" + suffix,
@@ -106,6 +116,24 @@ def _with_native_libraries_test(name):
 def _with_native_libraries_test_impl(env, target):
     _assert_native_library_basenames(env, target, ["*native_direct*"])
 
+def _with_native_libraries_in_deps_test(name):
+    native_target = _native_library_target(name, "native_direct")
+    util.helper_target(
+        kt_jvm_library,
+        name = name + "/subject",
+        srcs = [util.empty_file(name + "_Direct.kt")],
+        deps = [native_target],
+    )
+
+    analysis_test(
+        name = name,
+        impl = _with_native_libraries_in_deps_test_impl,
+        target = name + "/subject",
+    )
+
+def _with_native_libraries_in_deps_test_impl(env, target):
+    _assert_native_library_basenames(env, target, ["*native_direct*"])
+
 def _transitive_native_libraries_test(name):
     native_c = _native_library_target(name, "native_c")
     util.helper_target(
@@ -196,7 +224,7 @@ def _native_libraries_propagation_test_impl(env, target):
     ])
 
 def _kt_jvm_binary_propagates_direct_native_libraries_test(name):
-    native_target = _native_library_target(name, "native")
+    native_target = _native_shared_library_target(name, "native")
     util.helper_target(
         kt_jvm_binary,
         name = name + "/binary",
@@ -216,7 +244,7 @@ def _kt_jvm_binary_propagates_direct_native_libraries_test_impl(env, target):
     _assert_has_native_library_path_flag(env, target)
 
 def _kt_jvm_test_propagates_direct_native_libraries_test(name):
-    native_target = _native_library_target(name, "native")
+    native_target = _native_shared_library_target(name, "native")
     util.helper_target(
         kt_jvm_test,
         name = name + "/binary",
@@ -240,6 +268,7 @@ def native_libraries_test_suite(name):
         name = name,
         tests = [
             _with_native_libraries_test,
+            _with_native_libraries_in_deps_test,
             _transitive_native_libraries_test,
             _native_libraries_propagation_test,
             _kt_jvm_binary_propagates_direct_native_libraries_test,