From b3aed47595b5b54902fd4024b808126837df1601 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 23 Feb 2013 00:33:09 +0100 Subject: [PATCH] Test build without make on qt-android --- OsmAnd/ndk-build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/ndk-build.sh index 5d66ff83e8..077715720f 100755 --- a/OsmAnd/ndk-build.sh +++ b/OsmAnd/ndk-build.sh @@ -40,7 +40,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv5_ONLY" ./configure $QTBASE_CONFIGURATION \ -no-neon) fi - (cd "$SRCLOC/upstream.patched.armeabi" && make -j`nproc`) + (cd "$SRCLOC/upstream.patched.armeabi") fi if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY" ]; then @@ -52,7 +52,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY ./configure $QTBASE_CONFIGURATION \ -no-neon) fi - (cd "$SRCLOC/upstream.patched.armeabi-v7a" && make -j`nproc`) + (cd "$SRCLOC/upstream.patched.armeabi-v7a") if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a-neon" ]; then cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a-neon" @@ -62,7 +62,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY ./configure $QTBASE_CONFIGURATION \ -qtlibinfix _neon) fi - (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon" && make -j`nproc`) + (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon") fi if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_X86_ONLY" ]; then @@ -73,7 +73,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_X86_ONLY" ]; then (cd "$SRCLOC/upstream.patched.x86" && \ ./configure $QTBASE_CONFIGURATION) fi - (cd "$SRCLOC/upstream.patched.x86" && make -j`nproc`) + (cd "$SRCLOC/upstream.patched.x86") fi if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then @@ -84,7 +84,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then (cd "$SRCLOC/upstream.patched.mips" && \ ./configure $QTBASE_CONFIGURATION) fi - (cd "$SRCLOC/upstream.patched.mips" && make -j`nproc`) + (cd "$SRCLOC/upstream.patched.mips") fi (cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) \ No newline at end of file