Include native library paths in kt_ targets

MODULE.release.bazel

@@ -7,6 +7,7 @@ module(
 
 bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_cc", version = "0.0.16")
 bazel_dep(name = "rules_java", version = "8.9.0")
 bazel_dep(name = "rules_android", version = "0.7.1")
 bazel_dep(name = "bazel_features", version = "1.39.0")

examples/nested_module_resources/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library", "kt_jvm_test")
 
 kt_jvm_binary(
@@ -75,3 +76,17 @@ kt_jvm_test(
         "@nested//:printer",
     ],
 )
+
+cc_binary(
+    name = "native_resource_helper",
+    srcs = ["native/native_resource_helper.cc"],
+    linkshared = 1,
+)
+
+kt_jvm_test(
+    name = "native_library_test",
+    srcs = ["NativeLibraryPathTest.kt"],
+    main_class = "NativeLibraryPathTest",
+    test_class = "NativeLibraryPathTest",
+    runtime_deps = [":native_resource_helper"],
+)

examples/nested_module_resources/MODULE.bazel

@@ -1,5 +1,6 @@
 module(name = "nested_module_resources")
 
+bazel_dep(name = "rules_cc", version = "0.0.16")
 bazel_dep(name = "rules_kotlin", version = "1.9.5")
 local_path_override(
     module_name = "rules_kotlin",

examples/nested_module_resources/NativeLibraryPathTest.kt

@@ -0,0 +1,7 @@
+object NativeLibraryPathTest {
+  @JvmStatic
+  fun main(args: Array<String>) {
+    System.loadLibrary("native_resource_helper")
+    println("Loaded native_resource_helper from runtime_deps.")
+  }
+}

examples/nested_module_resources/README.md

@@ -3,6 +3,7 @@
 ## What This Tests
 
 This example tests **resource path resolution across Bazel module boundaries** when using `resource_strip_prefix`.
+It also includes a `kt_jvm_test` that loads a shared native library from `runtime_deps`, so the example fails if `java.library.path` is not wired correctly.
 
 ## Problem Statement
 

examples/nested_module_resources/native/native_resource_helper.cc

@@ -0,0 +1,3 @@
+extern "C" int native_resource_helper_symbol() {
+    return 0;
+}

kotlin/internal/jvm/compile.bzl

@@ -15,6 +15,7 @@ load(
     "@bazel_skylib//lib:sets.bzl",
     _sets = "sets",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "@rules_java//java:defs.bzl",
     "JavaInfo",
@@ -818,6 +819,7 @@ def _kt_jvm_produce_output_jar_actions(
         deps = compile_deps.deps,
         runtime_deps = compile_deps.runtime_deps,
         exports = compile_deps.exports,
+        native_libraries = compile_deps.native_libraries,
         neverlink = getattr(ctx.attr, "neverlink", False),
         generated_source_jar = generated_source_jar,
         generated_class_jar = generated_class_jar,
@@ -975,6 +977,7 @@ def _run_kt_java_builder_actions(
             deps = compile_deps.deps,
             runtime_deps = compile_deps.runtime_deps,
             exports = compile_deps.exports,
+            native_libraries = compile_deps.native_libraries,
             neverlink = getattr(ctx.attr, "neverlink", False),
         )
         java_infos.append(kt_java_info)
@@ -1121,7 +1124,13 @@ def _export_only_providers(ctx, actions, attr, outputs):
         output_jar = toolchains.kt.empty_jar,
         compile_jar = toolchains.kt.empty_jar,
         deps = [_java_info(d) for d in attr.deps],
+        runtime_deps = [
+            runtime_dep
+            for runtime_dep in [_java_info(d) for d in getattr(attr, "runtime_deps", [])]
+            if runtime_dep != None
+        ],
         exports = [_java_info(d) for d in getattr(attr, "exports", [])],
+        native_libraries = [d[CcInfo] for d in getattr(attr, "runtime_deps", []) if CcInfo in d],
         neverlink = getattr(attr, "neverlink", False),
         jdeps = output_jdeps,
     )

kotlin/internal/jvm/impl.bzl

@@ -42,6 +42,48 @@ load("//third_party:jarjar.bzl", "jarjar_action")
 def _artifact_short_path(artifact):
     return artifact.short_path
 
+def _native_library_artifact(library_to_link):
+    for field in [
+        "resolved_symlink_dynamic_library",
+        "dynamic_library",
+    ]:
+        artifact = getattr(library_to_link, field, None)
+        if artifact:
+            return artifact
+    return None
+
+def _native_library_jvm_flags(ctx, java_info):
+    native_library_dirs = []
+    seen_dirs = {}
+    for library_to_link in java_info.transitive_native_libraries.to_list():
+        artifact = _native_library_artifact(library_to_link)
+        if not artifact:
+            continue
+
+        short_path_dir = paths.dirname(artifact.short_path)
+        if short_path_dir in seen_dirs:
+            continue
+
+        seen_dirs[short_path_dir] = True
+        native_library_dirs.append(short_path_dir)
+
+    if not native_library_dirs:
+        return []
+
+    if is_windows(ctx):
+        workspace_prefix = ctx.workspace_name + "\\"
+        java_library_path = ctx.configuration.host_path_separator.join([
+            "%JAVA_RUNFILES%\\%s%s" % (workspace_prefix, path) if path != "." else "%JAVA_RUNFILES%\\%s" % ctx.workspace_name
+            for path in native_library_dirs
+        ])
+    else:
+        java_library_path = ctx.configuration.host_path_separator.join([
+            "${RUNPATH}%s" % path if path != "." else "${RUNPATH}"
+            for path in native_library_dirs
+        ])
+
+    return ["-Djava.library.path=%s" % java_library_path]
+
 def _make_providers(ctx, providers, runfiles_targets, transitive_files = depset(order = "default"), executable = None, *additional_providers):
     files = [ctx.outputs.jar]
     if providers.java.outputs.jdeps:
@@ -359,7 +401,7 @@ def kt_jvm_binary_impl(ctx):
         ctx,
         providers.java.transitive_runtime_jars,
         ctx.attr.main_class,
-        jvm_flags,
+        jvm_flags + _native_library_jvm_flags(ctx, providers.java),
     )
     if len(ctx.attr.srcs) == 0 and len(ctx.attr.deps) > 0:
         fail("deps without srcs is invalid. To add runtime classpath and resources, use runtime_deps.", attr = "deps")
@@ -425,7 +467,7 @@ def kt_jvm_junit_test_impl(ctx):
         jvm_flags = [
             "-ea",
             "-Dbazel.test_suite=%s" % test_class,
-        ] + jvm_flags,
+        ] + jvm_flags + _native_library_jvm_flags(ctx, providers.java),
         is_test = True,
     )
 

kotlin/internal/jvm/jvm_deps.bzl

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@bazel_skylib//lib:sets.bzl", _sets = "sets")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "@rules_java//java:defs.bzl",
     "JavaInfo",
@@ -60,7 +61,12 @@ def _jvm_deps(ctx, toolchains, associate_deps, deps = [], deps_java_infos = [],
         exports = [_java_info(d) for d in exports],
         associate_jars = associates.jars,
         compile_jars = depset(direct = compile_depset_list_filtered),
-        runtime_deps = [_java_info(d) for d in runtime_deps],
+        runtime_deps = [
+            java_info
+            for java_info in [_java_info(d) for d in runtime_deps]
+            if java_info != None
+        ],
+        native_libraries = [d[CcInfo] for d in runtime_deps if CcInfo in d],
     )
 
 jvm_deps_utils = struct(

src/test/data/jvm/basic/BUILD

@@ -1,5 +1,6 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_java//java:defs.bzl", "java_binary", "java_library")
-load("//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library")
+load("//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library", "kt_jvm_test")
 
 # Copyright 2018 The Bazel Authors. All rights reserved.
 #
@@ -111,6 +112,27 @@ kt_jvm_library(
     visibility = ["//src/test/kotlin:__subpackages__"],
 )
 
+cc_binary(
+    name = "native_lib",
+    srcs = ["native/native_lib.cc"],
+    linkshared = 1,
+)
+
+kt_jvm_binary(
+    name = "NativeLibraryPathBinary",
+    srcs = ["native/NativeLibraryPathBinary.kt"],
+    main_class = "NativeLibraryPathBinaryKt",
+    runtime_deps = [":native_lib"],
+)
+
+kt_jvm_test(
+    name = "NativeLibraryPathTest",
+    srcs = ["native/NativeLibraryPathTest.kt"],
+    test_class = "NativeLibraryPathTest",
+    runtime_deps = [":native_lib"],
+    deps = ["@kotlin_rules_maven//:junit_junit"],
+)
+
 filegroup(
     name = "basic",
     srcs = [
@@ -129,3 +151,13 @@ filegroup(
     ],
     visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "basic_test_data",
+    testonly = 1,
+    srcs = [
+        ":NativeLibraryPathBinary",
+        ":NativeLibraryPathTest",
+    ],
+    visibility = ["//visibility:public"],
+)

src/test/data/jvm/basic/native/NativeLibraryPathBinary.kt

@@ -0,0 +1,3 @@
+fun main() {
+  System.loadLibrary("native_lib")
+}

src/test/data/jvm/basic/native/NativeLibraryPathTest.kt

@@ -0,0 +1,8 @@
+import org.junit.Test
+
+class NativeLibraryPathTest {
+  @Test
+  fun loadsSharedLibraryFromRuntimeDeps() {
+    System.loadLibrary("native_lib")
+  }
+}

src/test/data/jvm/basic/native/native_lib.cc

@@ -0,0 +1,3 @@
+extern "C" int native_lib_symbol() {
+    return 0;
+}

src/test/kotlin/io/bazel/kotlin/BUILD

@@ -36,7 +36,10 @@ kt_jvm_library(
 kt_rules_e2e_test(
     name = "KotlinJvmBasicAssertionTest",
     srcs = ["KotlinJvmBasicAssertionTest.kt"],
-    data = ["//src/test/data/jvm/basic"],
+    data = [
+        "//src/test/data/jvm/basic",
+        "//src/test/data/jvm/basic:basic_test_data",
+    ],
 )
 
 kt_rules_e2e_test(

src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt

@@ -87,6 +87,18 @@ class KotlinJvmBasicAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/b
     )
   }
 
+  @Test
+  fun testNativeLibraryRuntimeDeps() {
+    assertExecutableRunfileSucceeds(
+      "NativeLibraryPathBinary",
+      description = "kt_jvm_binary should load shared libraries from runtime_deps"
+    )
+    assertExecutableRunfileSucceeds(
+      "NativeLibraryPathTest",
+      description = "kt_jvm_test should load shared libraries from runtime_deps"
+    )
+  }
+
   @Test
   fun testModuleNaming() {
     jarTestCase(

src/test/starlark/internal/jvm/BUILD.bazel

@@ -1,6 +1,9 @@
 load(":jvm_deps_tests.bzl", "jvm_deps_test_suite")
 load(":kt_jvm_binary_env_test.bzl", "kt_jvm_binary_env_test_suite")
+load(":native_libraries_tests.bzl", "native_libraries_test_suite")
 
 jvm_deps_test_suite(name = "jvm_tests")
 
 kt_jvm_binary_env_test_suite(name = "kt_jvm_binary_env_tests")
+
+native_libraries_test_suite(name = "native_libraries_tests")