From a3f4cbd9fb5f1f4682013120bafd8eb8fcece672 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 21 Feb 2013 09:50:53 +0200 Subject: [PATCH] F***, don't mix tabs with spaces --- OsmAnd/ndk-build.sh | 99 ++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/ndk-build.sh index 2df3264541..5d66ff83e8 100755 --- a/OsmAnd/ndk-build.sh +++ b/OsmAnd/ndk-build.sh @@ -1,10 +1,11 @@ #!/bin/bash + SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# configure.sh -"$SCRIPT_LOC"/../../core/externals/configure.sh -SRCLOC="$SCRIPT_LOC"/../../core/externals/qtbase-android NAME=$(basename $(dirname "${BASH_SOURCE[0]}") ) +"$SCRIPT_LOC/../../core/externals/configure.sh" +SRCLOC="$SCRIPT_LOC/../../core/externals/qtbase-android" + if [ ! -d "$ANDROID_SDK" ]; then echo "ANDROID_SDK is not set" exit @@ -18,8 +19,8 @@ export ANDROID_NDK_ROOT=$ANDROID_NDK export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - BUILD_ALL=1 - echo "BUILD_ALL set to true" + BUILD_ALL=1 + echo "BUILD_ALL set to true" fi QTBASE_CONFIGURATION=\ @@ -30,62 +31,60 @@ QTBASE_CONFIGURATION=\ "-c++11 -shared -release "\ "-v" - if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv5_ONLY" ]; then - if [ ! -d "$SRCLOC/upstream.patched.armeabi" ]; then - cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi" - export ANDROID_TARGET_ARCH=armeabi - export ANDROID_NDK_PLATFORM=android-8 - (cd "$SRCLOC/upstream.patched.armeabi" && \ - ./configure $QTBASE_CONFIGURATION \ - -no-neon) - fi - (cd "$SRCLOC/upstream.patched.armeabi" && make -j`nproc`) + if [ ! -d "$SRCLOC/upstream.patched.armeabi" ]; then + cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi" + export ANDROID_TARGET_ARCH=armeabi + export ANDROID_NDK_PLATFORM=android-8 + (cd "$SRCLOC/upstream.patched.armeabi" && \ + ./configure $QTBASE_CONFIGURATION \ + -no-neon) + fi + (cd "$SRCLOC/upstream.patched.armeabi" && make -j`nproc`) fi if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY" ]; then - if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a" ]; then - cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a" - export ANDROID_TARGET_ARCH=armeabi-v7a - export ANDROID_NDK_PLATFORM=android-8 - (cd "$SRCLOC/upstream.patched.armeabi-v7a" && \ - ./configure $QTBASE_CONFIGURATION \ - -no-neon) - fi - (cd "$SRCLOC/upstream.patched.armeabi-v7a" && make -j`nproc`) - - if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a-neon" ]; then - cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a-neon" - export ANDROID_TARGET_ARCH=armeabi-v7a - export ANDROID_NDK_PLATFORM=android-8 - (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon" && \ - ./configure $QTBASE_CONFIGURATION \ - -qtlibinfix _neon) - fi - (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon" && make -j`nproc`) + if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a" ]; then + cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a" + export ANDROID_TARGET_ARCH=armeabi-v7a + export ANDROID_NDK_PLATFORM=android-8 + (cd "$SRCLOC/upstream.patched.armeabi-v7a" && \ + ./configure $QTBASE_CONFIGURATION \ + -no-neon) + fi + (cd "$SRCLOC/upstream.patched.armeabi-v7a" && make -j`nproc`) + + if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a-neon" ]; then + cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a-neon" + export ANDROID_TARGET_ARCH=armeabi-v7a + export ANDROID_NDK_PLATFORM=android-8 + (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon" && \ + ./configure $QTBASE_CONFIGURATION \ + -qtlibinfix _neon) + fi + (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon" && make -j`nproc`) fi if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_X86_ONLY" ]; then - if [ ! -d "$SRCLOC/upstream.patched.x86" ]; then - cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.x86" - export ANDROID_TARGET_ARCH=x86 - export ANDROID_NDK_PLATFORM=android-9 - (cd "$SRCLOC/upstream.patched.x86" && \ - ./configure $QTBASE_CONFIGURATION) - fi - (cd "$SRCLOC/upstream.patched.x86" && make -j`nproc`) + if [ ! -d "$SRCLOC/upstream.patched.x86" ]; then + cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.x86" + export ANDROID_TARGET_ARCH=x86 + export ANDROID_NDK_PLATFORM=android-9 + (cd "$SRCLOC/upstream.patched.x86" && \ + ./configure $QTBASE_CONFIGURATION) + fi + (cd "$SRCLOC/upstream.patched.x86" && make -j`nproc`) fi if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then - if [ ! -d "$SRCLOC/upstream.patched.mips" ]; then + if [ ! -d "$SRCLOC/upstream.patched.mips" ]; then cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.mips" - export ANDROID_TARGET_ARCH=mips - export ANDROID_NDK_PLATFORM=android-9 - (cd "$SRCLOC/upstream.patched.mips" && \ + export ANDROID_TARGET_ARCH=mips + export ANDROID_NDK_PLATFORM=android-9 + (cd "$SRCLOC/upstream.patched.mips" && \ ./configure $QTBASE_CONFIGURATION) - fi - (cd "$SRCLOC/upstream.patched.mips" && make -j`nproc`) + fi + (cd "$SRCLOC/upstream.patched.mips" && make -j`nproc`) fi -cd $SCRIPT_LOC -$ANDROID_NDK/ndk-build -j`nproc` \ No newline at end of file +(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) \ No newline at end of file