diff --git a/sys/android-build.sh b/sys/android-build.sh index 85fdb32726..ad741be00e 100755 --- a/sys/android-build.sh +++ b/sys/android-build.sh @@ -34,7 +34,7 @@ case "$1" in # FLAGS="-mlong-calls" # export LDFLAGS="-fuse-ld=gold" ;; -"arm") +arm) NDK_ARCH=arm STATIC_BUILD=0 STRIP=arm-eabi-strip @@ -44,11 +44,21 @@ arm64|aarch64) STATIC_BUILD=0 STRIP=aarch64-linux-android-strip ;; -"x86") +x64|x86_64) + NDK_ARCH=x86_64 + export NDK_ARCH + STATIC_BUILD=0 + STRIP=strip + ;; +x86) NDK_ARCH=x86 STATIC_BUILD=0 STRIP=strip ;; +x64-static|static-x64) + NDK_ARCH=x86 + STATIC_BUILD=1 + ;; arm64-static|static-arm64) NDK_ARCH=arm64 STATIC_BUILD=1 @@ -79,7 +89,7 @@ local) NDK_ARCH=local ;; ""|"-h") - echo "Usage: android-build.sh [local|arm|arm64|x86|mips|mips64][-static]" + echo "Usage: android-build.sh [local|arm|arm64|x86|x64|mips|mips64][-static]" exit 1 ;; *) diff --git a/sys/android-shell.sh b/sys/android-shell.sh index 9358fea0fd..e0d16f7507 100755 --- a/sys/android-shell.sh +++ b/sys/android-shell.sh @@ -17,7 +17,11 @@ mips) AR=mipsel-linux-android-ar RANLIB=mipsel-linux-android-ranlib ;; -x86) +x64) + NDK_ARCH=x86_64 + export NDK_ARCH + ;; +x86|x86_64) export NDK_ARCH ;; aarch64|arm64) @@ -35,7 +39,7 @@ local) export ANDROID=1 ;; *) - echo "Usage: $0 [arm64|arm|mips|mips64|x86]" + echo "Usage: $0 [arm64|arm|mips|mips64|x86|x64]" exit 1 ;; esac