From 2f613d5b840509027d35d3964513bdc95fb70cae Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Tue, 24 Oct 2023 15:05:00 +0100
Subject: [PATCH] fix: Depend on upstream jna instead of the bundled one

---
 WORKSPACE             | 10 ++++++++++
 testing/test_defs.bzl |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/WORKSPACE b/WORKSPACE
index 607af0d1754..884ba207110 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -858,6 +858,16 @@ jvm_maven_import_external(
     server_urls = ["https://repo1.maven.org/maven2"],
 )
 
+# Usually, we'd get this from the JetBrains SDK, but the bundled one not aware of Bazel platforms,
+# so it fails on certain setups.
+jvm_maven_import_external(
+    name = "jna",
+    artifact = "net.java.dev.jna:jna:5.13.0",
+    artifact_sha256 = "66d4f819a062a51a1d5627bffc23fac55d1677f0e0a1feba144aabdd670a64bb",
+    licenses = ["notice"],  # Apache 2.0
+    server_urls = ["https://repo1.maven.org/maven2"],
+)
+
 # io_grpc_grpc_java dependencies
 load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS", "grpc_java_repositories")
 
diff --git a/testing/test_defs.bzl b/testing/test_defs.bzl
index 961d7227434..9c1acbbdd03 100644
--- a/testing/test_defs.bzl
+++ b/testing/test_defs.bzl
@@ -192,6 +192,9 @@ def intellij_integration_test_suite(
     deps = list(deps)
     deps.extend([
         "//testing:lib",
+        # Usually, we'd get this from the JetBrains SDK, but the bundled one not aware of Bazel platforms,
+        # so it fails on certain setups.
+        "@jna",
     ])
     runtime_deps = list(runtime_deps)
     runtime_deps.extend([