From 3b3e4fc4ca68070738d99825bc3b67653e68300b Mon Sep 17 00:00:00 2001 From: Starlet Leonhart Date: Thu, 8 Aug 2019 19:59:29 -0400 Subject: [PATCH] Add ARM64 Android support in make.sh (#1099) * Add Android ARM64 support. * Fix some things Backports commit 0cd69ee03b3c4420e22653f752f0b0aec558805f from qemu --- make.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index 54204d42..6101cbea 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,8 @@ OPTIONS: macos-universal-no Build non-universal binaries that includes only 64-bit code on macOS cross-win32 Cross-compile Windows 32-bit binary with MinGW cross-win64 Cross-compile Windows 64-bit binary with MinGW - cross-android Cross-compile for Android + cross-android_arm Cross-compile for Android Arm + cross-android_arm64 Cross-compile for Android Arm64 ios Cross-compile for all iDevices (armv7 + armv7s + arm64) ios_armv7 Cross-compile for ArmV7 (iPod 4, iPad 1/2/3, iPhone4, iPhone4S) ios_armv7s Cross-compile for ArmV7s (iPad 4, iPhone 5C, iPad mini) @@ -150,7 +151,8 @@ case "$1" in "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE};; "cross-win32" ) build_cross i686-w64-mingw32;; "cross-win64" ) build_cross x86_64-w64-mingw32;; - "cross-android" ) CROSS=arm-linux-androideabi ${MAKE};; + "cross-android_arm" ) CROSS=arm-linux-androideabi ${MAKE};; + "cross-android_arm64" ) CROSS=aarch64-linux-android ${MAKE};; "ios" ) build_iOS;; "ios_armv7" ) build_iOS armv7;; "ios_armv7s" ) build_iOS armv7s;;