|
@@ -1,26 +1,26 @@
|
|
#!/bin/bash
|
|
#!/bin/bash
|
|
|
|
|
|
-if [ -z "$ANDROID_HOME" ]; then
|
|
|
|
- if [ -d "$HOME/Android/Sdk" ]; then
|
|
|
|
- export ANDROID_HOME="$HOME/Android/Sdk"
|
|
|
|
- elif [ -d "$HOME/.local/lib/android/sdk" ]; then
|
|
|
|
- export ANDROID_HOME="$HOME/.local/lib/android/sdk"
|
|
|
|
- elif [ -d "$HOME/Library/Android/sdk" ]; then
|
|
|
|
- export ANDROID_HOME="$HOME/Library/Android/sdk"
|
|
|
|
- fi
|
|
|
|
-fi
|
|
|
|
|
|
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$ANDROID_HOME"
|
|
|
|
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$HOME/Android/Sdk"
|
|
|
|
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$HOME/.local/lib/android/sdk"
|
|
|
|
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$HOME/Library/Android/sdk"
|
|
|
|
|
|
-_NDK="$ANDROID_HOME/ndk/23.1.7779620"
|
|
|
|
-[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"
|
|
|
|
|
|
+_NDK="$ANDROID_HOME/ndk/25.0.8775105"
|
|
[ -f "$_NDK/source.properties" ] || _NDK="$NDK"
|
|
[ -f "$_NDK/source.properties" ] || _NDK="$NDK"
|
|
-[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle"
|
|
|
|
|
|
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"
|
|
|
|
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_ROOT"
|
|
|
|
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_LATEST_HOME"
|
|
|
|
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/23.2.8568313"
|
|
|
|
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/22.1.7171670"
|
|
[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/21.4.7075529"
|
|
[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/21.4.7075529"
|
|
|
|
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle"
|
|
|
|
|
|
if [ ! -f "$_NDK/source.properties" ]; then
|
|
if [ ! -f "$_NDK/source.properties" ]; then
|
|
echo "Error: NDK not found."
|
|
echo "Error: NDK not found."
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
+export ANDROID_HOME
|
|
export ANDROID_NDK_HOME=$_NDK
|
|
export ANDROID_NDK_HOME=$_NDK
|
|
export NDK=$_NDK
|
|
export NDK=$_NDK
|
|
|
|
|
|
@@ -44,8 +44,8 @@ fi
|
|
|
|
|
|
export TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
|
|
export TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
|
|
|
|
|
|
-export ANDROID_ARM_CC=$TOOLCHAIN/armv7a-linux-androideabi16-clang
|
|
|
|
-export ANDROID_ARM_CXX=$TOOLCHAIN/armv7a-linux-androideabi16-clang++
|
|
|
|
|
|
+export ANDROID_ARM_CC=$TOOLCHAIN/armv7a-linux-androideabi21-clang
|
|
|
|
+export ANDROID_ARM_CXX=$TOOLCHAIN/armv7a-linux-androideabi21-clang++
|
|
export ANDROID_ARM_CC_21=$TOOLCHAIN/armv7a-linux-androideabi21-clang
|
|
export ANDROID_ARM_CC_21=$TOOLCHAIN/armv7a-linux-androideabi21-clang
|
|
export ANDROID_ARM_CXX_21=$TOOLCHAIN/armv7a-linux-androideabi21-clang++
|
|
export ANDROID_ARM_CXX_21=$TOOLCHAIN/armv7a-linux-androideabi21-clang++
|
|
|
|
|
|
@@ -53,8 +53,8 @@ export ANDROID_ARM64_CC=$TOOLCHAIN/aarch64-linux-android21-clang
|
|
export ANDROID_ARM64_CXX=$TOOLCHAIN/aarch64-linux-android21-clang++
|
|
export ANDROID_ARM64_CXX=$TOOLCHAIN/aarch64-linux-android21-clang++
|
|
export ANDROID_ARM64_AR=$TOOLCHAIN/aarch64-linux-android21-ar
|
|
export ANDROID_ARM64_AR=$TOOLCHAIN/aarch64-linux-android21-ar
|
|
|
|
|
|
-export ANDROID_X86_CC=$TOOLCHAIN/i686-linux-android16-clang
|
|
|
|
-export ANDROID_X86_CXX=$TOOLCHAIN/i686-linux-android16-clang++
|
|
|
|
|
|
+export ANDROID_X86_CC=$TOOLCHAIN/i686-linux-android21-clang
|
|
|
|
+export ANDROID_X86_CXX=$TOOLCHAIN/i686-linux-android21-clang++
|
|
export ANDROID_X86_CC_21=$TOOLCHAIN/i686-linux-android21-clang
|
|
export ANDROID_X86_CC_21=$TOOLCHAIN/i686-linux-android21-clang
|
|
export ANDROID_X86_CXX_21=$TOOLCHAIN/i686-linux-android21-clang++
|
|
export ANDROID_X86_CXX_21=$TOOLCHAIN/i686-linux-android21-clang++
|
|
|
|
|