Fix[ci_build]: correctly set NDK_PREBUILT_ARCH for the new NDK

artdeell · artdeell · commit 56e53e302512 · 2025-08-06T20:18:35.000+03:00
diff --git a/ci_build_arch_aarch32.sh b/ci_build_arch_aarch32.sh
@@ -3,7 +3,6 @@ set -e
 
 export TARGET=armv7a-linux-androideabi21
 export TARGET_JDK=arm
-export NDK_PREBUILT_ARCH=/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/arm-linux-androideabi/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_arch_aarch64.sh b/ci_build_arch_aarch64.sh
@@ -6,7 +6,6 @@ else
   export TARGET=aarch64-linux-android21
 fi
 export TARGET_JDK=aarch64
-export NDK_PREBUILT_ARCH=/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/aarch64-linux-android/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_arch_x86.sh b/ci_build_arch_x86.sh
@@ -3,7 +3,6 @@ set -e
 
 export TARGET=i686-linux-android21
 export TARGET_JDK=x86
-export NDK_PREBUILT_ARCH=/toolchains/x86-4.9/prebuilt/linux-x86_64/i686-linux-android/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_arch_x86_64.sh b/ci_build_arch_x86_64.sh
@@ -3,7 +3,6 @@ set -e
 
 export TARGET=x86_64-linux-android21
 export TARGET_JDK=x86_64
-export NDK_PREBUILT_ARCH=/toolchains/x86_64-4.9/prebuilt/linux-x86_64/x86_64-linux-android/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_global.sh b/ci_build_global.sh
@@ -4,6 +4,8 @@ set -e
 
 export JDK_DEBUG_LEVEL=release
 
+export NDK_PREBUILT_ARCH=/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
 if [[ "$BUILD_IOS" != "1" ]]; then
   wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux.zip"
   ./extractndk.sh
