From b49b84c30743614a0db2e30e6f48395a48661b9a Mon Sep 17 00:00:00 2001
From: David Schachter <davidschachter@appdevforall.org>
Date: Fri, 24 Jul 2026 17:17:01 -0700
Subject: [PATCH 1/2] ADFA-4643: Remove com.sun.jna from the APK

com.android.tools:common pulls in net.java.dev.jna transitively via
jna-platform, purely for a macOS-only Rosetta/x86-emulation detector
(ComputerArchUtilsKt.computeIsRosetta()) that's gated behind an
os.name check unreachable on Android. Exclude the jna group where
aapt2-common is depended on to drop it from the APK, and remove the
now-redundant com/sun/jna packaging exclude.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt   | 1 -
 subprojects/aaptcompiler/build.gradle.kts                     | 4 +++-
 templates-api/build.gradle.kts                                | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt
index 8e8a63e5b9..f354555e43 100644
--- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt
+++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt
@@ -97,7 +97,6 @@ fun Project.configureAndroidModule(coreLibDesugDep: Provider<MinimalExternalModu
 						"META-INF/CHANGES",
 						"META-INF/README.md",
 						"META-INF/LICENSE-notice.md",
-						"com/sun/jna/**",
 					),
 				)
 				pickFirsts.addAll(
diff --git a/subprojects/aaptcompiler/build.gradle.kts b/subprojects/aaptcompiler/build.gradle.kts
index fad2115bd8..ccccb89e09 100644
--- a/subprojects/aaptcompiler/build.gradle.kts
+++ b/subprojects/aaptcompiler/build.gradle.kts
@@ -40,7 +40,9 @@ dependencies {
 	implementation(projects.logger)
 
 	api(libs.aapt2.annotations)
-	api(libs.aapt2.common)
+	api(libs.aapt2.common) {
+		exclude(group = "net.java.dev.jna")
+	}
 	api(libs.composite.layoutlibApi)
 
 	api(projects.subprojects.aapt2Proto)
diff --git a/templates-api/build.gradle.kts b/templates-api/build.gradle.kts
index a8ca000bc1..0370def287 100644
--- a/templates-api/build.gradle.kts
+++ b/templates-api/build.gradle.kts
@@ -35,7 +35,9 @@ dependencies {
 	api(projects.subprojects.xmlDom)
 	api(projects.subprojects.xmlUtils)
 
-	api(libs.aapt2.common)
+	api(libs.aapt2.common) {
+		exclude(group = "net.java.dev.jna")
+	}
 	api(libs.androidx.annotation)
 	api(libs.androidx.appcompat)
 	api(libs.google.material)

From 1f921eb6187672e1e09910d114acaa3f5f80814b Mon Sep 17 00:00:00 2001
From: David Schachter <davidschachter@appdevforall.org>
Date: Fri, 24 Jul 2026 17:18:21 -0700
Subject: [PATCH 2/2] style: Fix tab/space formatting in
 templates-api/build.gradle.kts

Spotless ratchet pulled in this file's existing 4-space indentation
after ADFA-4643 touched it. Auto-fixed by spotlessApply.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 templates-api/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates-api/build.gradle.kts b/templates-api/build.gradle.kts
index 0370def287..3175c3aa56 100644
--- a/templates-api/build.gradle.kts
+++ b/templates-api/build.gradle.kts
@@ -42,5 +42,5 @@ dependencies {
 	api(libs.androidx.appcompat)
 	api(libs.google.material)
 
-    implementation(libs.google.gson)
+	implementation(libs.google.gson)
 }