fix: broken AndroidUnsafe relocation

Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>

Author: itsaky-adfa

…ge-UnsafeAndroid-in-embeddable-jar.patch …ge-AndroidUnsafe-in-embeddable-jar.patchpatches/0008-feat-package-UnsafeAndroid-in-embeddable-jar.patch renamed to patches/0008-feat-package-AndroidUnsafe-in-embeddable-jar.patch patches/0008-feat-package-UnsafeAndroid-in-embeddable-jar.patch renamed to patches/0008-feat-package-AndroidUnsafe-in-embeddable-jar.patch

@@ -1,19 +1,19 @@
-From af21717100c674756df1e559b31f21706b579ffd Mon Sep 17 00:00:00 2001
+From b1e1aa32501204ef907dd33c566c23a07c9b2652 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 25 Mar 2026 15:29:30 +0530
-Subject: [PATCH 8/8] feat: package UnsafeAndroid in embeddable jar
+Subject: [PATCH 8/8] feat: package AndroidUnsafe in embeddable jar
 
 Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
 ---
  build.gradle.kts                              |   1 +
  gradle/verification-metadata.xml              |   5 +
- .../build.gradle.kts                          |  10 ++
+ .../build.gradle.kts                          |  15 ++
  .../unsafe-access-android/build.gradle.kts    |  79 ++++++++++
- .../util/containers/UnsafeAndroid.java        | 138 ++++++++++++++++++
+ .../util/containers/AndroidUnsafe.java        | 137 ++++++++++++++++++
  settings.gradle                               |   5 +-
- 6 files changed, 236 insertions(+), 2 deletions(-)
+ 6 files changed, 240 insertions(+), 2 deletions(-)
  create mode 100644 prepare/ide-plugin-dependencies/unsafe-access-android/build.gradle.kts
- create mode 100644 prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/UnsafeAndroid.java
+ create mode 100644 prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/AndroidUnsafe.java
 
 diff --git a/build.gradle.kts b/build.gradle.kts
 index 74e37d391fc4..3740535ed499 100644
@@ -44,7 +44,7 @@ index c859b3b8ca14..90f98779ef83 100644
           <artifact name="lz4-java-1.7.1.jar">
              <md5 value="d56d86823662a663a4d614dd5e117eff" origin="Generated by Gradle"/>
 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
-index 7f6cb0d149e3..f0a4f4f78473 100644
+index 7f6cb0d149e3..b87232ded0ff 100644
 --- 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
 @@ -31,6 +31,7 @@ dependencies {
@@ -63,7 +63,7 @@ index 7f6cb0d149e3..f0a4f4f78473 100644
      )
 
  tasks.register<ShadowJar>("embeddable") {
-@@ -62,6 +64,14 @@ tasks.register<ShadowJar>("embeddable") {
+@@ -62,12 +64,25 @@ tasks.register<ShadowJar>("embeddable") {
      configurations = listOf(embeddableJar)
 
      relocate("com.google.protobuf", "org.jetbrains.kotlin.protobuf")
@@ -72,12 +72,23 @@ index 7f6cb0d149e3..f0a4f4f78473 100644
 +    // It makes use of MethodHandles in order to access methods from the sun.misc.Unsafe
 +    // class, which are hidden API on Android. Remove this class and provide a drop-in
 +    // replacement instead.
-+    relocate("com.intellij.util.containers.Unsafe", "com.intellij.util.containers.UnsafeAndroid") {
-+        exclude("com.intellij.util.containers.UnsafeAndroid")
-+    }
      relocate("com.intellij", "$kotlinEmbeddableRootPackage.com.intellij") {
          // These are not real packages, but important string constants which are used by xml-reader.
          exclude("com.intellij.projectService")
+         exclude("com.intellij.applicationService")
++
++        // we want to replace this class with our implementation, keep both out of the kotlin namespace
++        exclude("com.intellij.util.containers.Unsafe")
++        exclude("com.intellij.util.containers.AndroidUnsafe")
+     }
+ 
++    // replace with our Android-specific implementation
++    exclude("com/intellij/util/containers/Unsafe")
++    relocate("com.intellij.util.containers.Unsafe", "com.intellij.util.containers.AndroidUnsafe")
++
+     packagesToRelocate.forEach {
+         relocate(it, "$kotlinEmbeddableRootPackage.$it")
+     }
 diff --git a/prepare/ide-plugin-dependencies/unsafe-access-android/build.gradle.kts b/prepare/ide-plugin-dependencies/unsafe-access-android/build.gradle.kts
 new file mode 100644
 index 000000000000..07633a92595e
@@ -163,12 +174,12 @@ index 000000000000..07633a92595e
 +    dependsOn(extractHiddenapibypass)
 +    from(zipTree(hiddenapibypassClassesJar))
 +}
-diff --git a/prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/UnsafeAndroid.java b/prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/UnsafeAndroid.java
+diff --git a/prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/AndroidUnsafe.java b/prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/AndroidUnsafe.java
 new file mode 100644
-index 000000000000..d82643964c2d
+index 000000000000..4c179310346d
 --- /dev/null
-+++ b/prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/UnsafeAndroid.java
-@@ -0,0 +1,138 @@
++++ b/prepare/ide-plugin-dependencies/unsafe-access-android/src/main/java/com/intellij/util/containers/AndroidUnsafe.java
+@@ -0,0 +1,137 @@
 +/*
 + * Copyright 2010-2026 JetBrains s.r.o. and Kotlin Programming Language contributors.
 + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
@@ -177,15 +188,14 @@ index 000000000000..d82643964c2d
 +package com.intellij.util.containers;
 +
 +import android.util.Log;
-+import com.intellij.util.ReflectionUtil;
 +import org.lsposed.hiddenapibypass.HiddenApiBypass;
 +
 +import java.lang.reflect.Field;
 +import java.lang.reflect.Method;
 +import java.util.Arrays;
 +
 +@SuppressWarnings("all")
-+public class UnsafeAndroid {
++public class AndroidUnsafe {
 +
 +	private static final Object unsafe;
 +