From 4b3951c1db71270511655933125c7d7d259c7568 Mon Sep 17 00:00:00 2001 From: Oliver Behnke Date: Thu, 30 Aug 2018 09:08:15 +0000 Subject: [PATCH] Fix x86_64 BOINC build * Specify minimum Android API version explicitly, based on platform (or existing version) * Enable verbose builds --- android/build_androidtc_x86_64.sh | 2 +- android/build_boinc_x86_64.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build_androidtc_x86_64.sh b/android/build_androidtc_x86_64.sh index 7a7a11d812..3525331767 100755 --- a/android/build_androidtc_x86_64.sh +++ b/android/build_androidtc_x86_64.sh @@ -12,5 +12,5 @@ export ANDROID_TC="${ANDROID_TC:-$HOME/android-tc}" export ANDROID_TC_X86_64="${ANDROID_TC_X86_64:-$ANDROID_TC/x86_64}" if [ ! -d "${ANDROID_TC_X86_64}/x86_64-linux-android" ]; then - "${NDK_ROOT}/build/tools/make-standalone-toolchain.sh" --platform=android-21 --arch=x86_64 --install-dir="${ANDROID_TC_X86_64}" "$@" + "${NDK_ROOT}/build/tools/make-standalone-toolchain.sh" --verbose --platform=android-21 --arch=x86_64 --install-dir="${ANDROID_TC_X86_64}" "$@" fi diff --git a/android/build_boinc_x86_64.sh b/android/build_boinc_x86_64.sh index 84a6f78c7d..5332d3028e 100755 --- a/android/build_boinc_x86_64.sh +++ b/android/build_boinc_x86_64.sh @@ -24,8 +24,8 @@ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=x86_64-linux-android-gcc export CXX=x86_64-linux-android-g++ export LD=x86_64-linux-android-ld -export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE" -export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE" +export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE -D__ANDROID_API__=21" +export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE -D__ANDROID_API__=21" export LDFLAGS="-L$TCSYSROOT/usr/lib64 -L$TCINCLUDES/lib64 -llog -fPIE -pie" export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include" export PKG_CONFIG_SYSROOT_DIR="$TCSYSROOT"