From 10e7778656e60489cfb8b7b59ee3d84979cfc8fe Mon Sep 17 00:00:00 2001 From: Henry Chang Date: Wed, 12 Jul 2017 18:10:20 +0800 Subject: [PATCH] [fix] delete all -DB_ENDIAN to support all ABI (all android ABI uses little-endian) [fix] fix parameter of arm64-v8a --- build-all-arch.sh | 8 ++++---- setenv-android-mod.sh | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build-all-arch.sh b/build-all-arch.sh index b91cf48..35f4922 100755 --- a/build-all-arch.sh +++ b/build-all-arch.sh @@ -11,7 +11,7 @@ mkdir prebuilt curl -O "https://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz" tar xfz "${OPENSSL_VERSION}.tar.gz" -archs=(armeabi-v7a x86) +archs=(armeabi-v7a arm64-v8a x86) for arch in ${archs[@]}; do xLIB="/lib" @@ -26,18 +26,18 @@ for arch in ${archs[@]}; do _ANDROID_ARCH=arch-arm64 _ANDROID_EABI=aarch64-linux-android-4.9 #no xLIB="/lib64" - configure_platform="linux-generic64 -DB_ENDIAN" ;; + configure_platform="linux-generic64" ;; "mips") _ANDROID_TARGET_SELECT=arch-mips _ANDROID_ARCH=arch-mips _ANDROID_EABI=mipsel-linux-android-4.9 - configure_platform="android -DB_ENDIAN" ;; + configure_platform="android" ;; "mips64") _ANDROID_TARGET_SELECT=arch-mips64 _ANDROID_ARCH=arch-mips64 _ANDROID_EABI=mips64el-linux-android-4.9 xLIB="/lib64" - configure_platform="linux-generic64 -DB_ENDIAN" ;; + configure_platform="linux-generic64" ;; "x86") _ANDROID_TARGET_SELECT=arch-x86 _ANDROID_ARCH=arch-x86 diff --git a/setenv-android-mod.sh b/setenv-android-mod.sh index cad2ecc..ade9b00 100755 --- a/setenv-android-mod.sh +++ b/setenv-android-mod.sh @@ -183,8 +183,9 @@ export ARCH=arm export CROSS_COMPILE="arm-linux-androideabi-" if [ "$_ANDROID_TARGET_SELECT" == "arch-arm64-v8a" ]; then - export MACHINE=armv7 - export ARCH=arm64 + export MACHINE=armv8 + export SYSTEM=android64 + export ARCH=arm export CROSS_COMPILE="aarch64-linux-android-" fi