From: David Warburton Date: Mon, 22 Dec 2014 19:22:14 +0000 (-0500) Subject: Conditionaly enable android build X-Git-Tag: 1.2.0+RC1~2023 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=444df1d2fcd04f965a407e6cf6c0b9d5e5d4e997;p=platform%2Fupstream%2Fiotivity.git Conditionaly enable android build Change-Id: I3941abdb9b3352f0e52f320865d972ad0914ec16 Signed-off-by: David Warburton --- diff --git a/auto_build.sh b/auto_build.sh index 4edc0e0..efe7530 100755 --- a/auto_build.sh +++ b/auto_build.sh @@ -23,17 +23,21 @@ function build() # it requires gcc-4.9, currently only android-ndk-r10(for linux) # and windows android-ndk-r10(64bit target version) support these features. - echo "*********** Build for android x86 *************" - scons TARGET_OS=android TARGET_ARCH=x86 ANDROID_NDK=$1 RELEASE=$3 + if [ "$BUILD_FOR_ANDROID" = "true" ] + then - echo "*********** Build for android armeabi *************" - scons TARGET_OS=android TARGET_ARCH=armeabi ANDROID_NDK=$1 RELEASE=$3 + echo "*********** Build for android x86 *************" + scons TARGET_OS=android TARGET_ARCH=x86 ANDROID_NDK=$1 RELEASE=$3 - echo "*********** Build for android armeabi-v7a *************" - scons TARGET_OS=android TARGET_ARCH=armeabi-v7a ANDROID_NDK=$1 RELEASE=$3 + echo "*********** Build for android armeabi *************" + scons TARGET_OS=android TARGET_ARCH=armeabi ANDROID_NDK=$1 RELEASE=$3 - echo "*********** Build for android armeabi-v7a-hard *************" - scons TARGET_OS=android TARGET_ARCH=armeabi-v7a-hard ANDROID_NDK=$1 RELEASE=$3 + echo "*********** Build for android armeabi-v7a *************" + scons TARGET_OS=android TARGET_ARCH=armeabi-v7a ANDROID_NDK=$1 RELEASE=$3 + + echo "*********** Build for android armeabi-v7a-hard *************" + scons TARGET_OS=android TARGET_ARCH=armeabi-v7a-hard ANDROID_NDK=$1 RELEASE=$3 + fi echo "*********** Build for arduino avr *************" scons TARGET_OS=arduino TARGET_ARCH=avr ARDUINO_HOME=$2 RELEASE=$3