Updating build.sh in ButtonClicker sample using build_sample.sh

hak · hak · commit 7f7b55e61b20 · 2015-02-03T14:27:41.000-08:00
Bug: b/19129183
Change-Id: I5b0180d1e6e1be654e7e906447f8bfa54d8cea47
diff --git a/samples-android/ButtonClicker/build.sh b/samples-android/ButtonClicker/build.sh
@@ -1,24 +1,7 @@
 #!/bin/sh
+set -eua
 
-#setup build mode
-mode=$1
-if [ -z $1 ] ; then
-  echo “Default build mode: debug”
-  mode=debug
-fi
-
-#build library project
-echo “Switching to google-play-services_lib”
-
-pushd ../../google-play-services_lib/
-android update lib-project --path .
-ant $mode
-popd
-
-#Create ant
-echo “Updating ANT build settings”
-android update project --path .
-
-#Execute ndk-build && ant
-ndk-build && ant $mode
+declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+pushd "${script_dir}"
+source ../build_sample.sh
 
