From ba852ed50579031e69a2cbe75afb7a5f721f7a70 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Thu, 22 Sep 2016 08:18:52 -0600 Subject: demos: Update smoke build script to be automatable --- demos/smoke/android/build-and-install | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/demos/smoke/android/build-and-install b/demos/smoke/android/build-and-install index cbdaf0ac..7402ec4f 100755 --- a/demos/smoke/android/build-and-install +++ b/demos/smoke/android/build-and-install @@ -2,13 +2,20 @@ set -e -SDK_DIR="$HOME/android/android-sdk-linux" -NDK_DIR="$HOME/android/android-ndk-r10e" +if [ -z "${ANDROID_SDK_HOME}" ]; +then echo "Please set ANDROID_SDK_HOME, exiting"; exit; +else echo "ANDROID_SDK_HOME is ${ANDROID_SDK_HOME}"; +fi + +if [ -z "${ANDROID_NDK_HOME}" ]; +then echo "Please set ANDROID_NDK_HOME, exiting"; exit; +else echo "ANDROID_NDK_HOME is ${ANDROID_NDK_HOME}"; +fi generate_local_properties() { : > local.properties - echo "sdk.dir=${SDK_DIR}" >> local.properties - echo "ndk.dir=${NDK_DIR}" >> local.properties + echo "sdk.dir=${ANDROID_SDK_HOME}" >> local.properties + echo "ndk.dir=${ANDROID_NDK_HOME}" >> local.properties } build() { -- cgit v1.2.3