Skip to content

Commit d061bcd

Browse files
committed
fix: duplicate AndroidUnsafe entries
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
1 parent f53c3f1 commit d061bcd

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

patches/0008-feat-package-AndroidUnsafe-in-embeddable-jar.patch renamed to patches/0008-feat-package-AndroidUnsafe-within-embeddable-jar.patch

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
From b1e1aa32501204ef907dd33c566c23a07c9b2652 Mon Sep 17 00:00:00 2001
1+
From 84a8c6a4f0e1d22f67dd424a1fdeffbe764d146e Mon Sep 17 00:00:00 2001
22
From: Akash Yadav <akashyadav@appdevforall.org>
3-
Date: Wed, 25 Mar 2026 15:29:30 +0530
4-
Subject: [PATCH 8/8] feat: package AndroidUnsafe in embeddable jar
3+
Date: Wed, 25 Mar 2026 17:25:33 +0530
4+
Subject: [PATCH 8/8] feat: package AndroidUnsafe within embeddable jar
5+
6+
This also ensures that the usages of Unsafe are already relocated in the JAR file, significantly reducing the build times of consuming projects.
57

68
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
79
---
@@ -44,7 +46,7 @@ index c859b3b8ca14..90f98779ef83 100644
4446
<artifact name="lz4-java-1.7.1.jar">
4547
<md5 value="d56d86823662a663a4d614dd5e117eff" origin="Generated by Gradle"/>
4648
diff --git a/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
47-
index 7f6cb0d149e3..b87232ded0ff 100644
49+
index 7f6cb0d149e3..7016cdfc25bb 100644
4850
--- a/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
4951
+++ b/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
5052
@@ -31,6 +31,7 @@ dependencies {
@@ -83,7 +85,7 @@ index 7f6cb0d149e3..b87232ded0ff 100644
8385
}
8486

8587
+ // replace with our Android-specific implementation
86-
+ exclude("com/intellij/util/containers/Unsafe")
88+
+ exclude("com/intellij/util/containers/Unsafe.class")
8789
+ relocate("com.intellij.util.containers.Unsafe", "com.intellij.util.containers.AndroidUnsafe")
8890
+
8991
packagesToRelocate.forEach {

0 commit comments

Comments
 (0)