diff options
Diffstat (limited to 'ci/build_android_x86.sh')
| -rw-r--r-- | ci/build_android_x86.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 6e84bc4e1..51f12bdc3 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -9,15 +9,13 @@ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" export ANDROID_NDK=~/android-ndk-r11c export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin" -export ANDROID_SDK="/usr/local/android-sdk-linux/" -export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" -export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH -export BUILD_PATH=android-${ARCH} - -export ANDROID_SDK_HOME=/opt/android-sdk-linux +export ANDROID_SDK=/opt/android-sdk-linux export ANDROID_HOME=/opt/android-sdk-linux -export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools +export ANDROID_SDK_HOME=/opt/android-sdk-linux +export ANDROID_SDK_ROOT=/opt/android-sdk-linux +export BUILD_PATH=android-${ARCH} +export PATH=${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/tools:${PATH} wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip [ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip @@ -25,8 +23,6 @@ wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_6 [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH pushd $BUILD_PATH -android list targets - cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) |