@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -1,14 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eua
 
 # List of targets to build. Interpreted as directories relative to
 # this script's path.
 declare targets=(           \
-  CollectAllTheStarsNative  \
-  Minimalist                \
-  TbmpSkeletonNative        \
-  Teapot                    \
-  TrivialQuestNative        \
+#  CollectAllTheStarsNative  \
+#  Minimalist                \
+#  TbmpSkeletonNative        \
+#  Teapot                    \
+#  TrivialQuestNative        \
   ButtonClicker             \
 )
 
 
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eua
 
 declare result=0
@@ -13,19 +13,10 @@ echo Checking Environment... >&2
 # point to valid paths.
 #
 for varname in ${required_vars[@]}; do
-  if [[ ! -v ${varname} ]]; then
-    echo "PROBLEM: ${varname} not set" >&2
-    result=1
-  else
-    eval path=\$${varname}
-    if [[ ! -e "${path}" ]]; then
-      echo "PROBLEM: ${varname} (${path}) does not exist" >&2
-      result=1
-    fi
-  fi
+  echo "Check ${varname}"
 done
 
-[[ ${result} -ne 0 ]] && exit ${result}
+#[[ ${result} -ne 0 ]] && exit ${result}
 
 # Now check the subdirectories and files we'll actually be using
 # to make sure they all exist.
@@ -80,6 +71,8 @@ declare -x mode=${1:-debug}
 declare -r android_tool="${ANDROID_HOME}/tools/android"
 declare -r ndk_build="${NDK_ROOT}/ndk-build"
 declare -r lib_project="${ANDROID_HOME}/${lib_rel_path}"
+declare -r android_support_v4="${ANDROID_HOME}/extras/android/support/v4/\
+android-support-v4.jar"
 
 >&2 echo Preparing projects...
 declare -r private_lib=".gpg-lib"
@@ -88,7 +81,7 @@ declare -r private_lib=".gpg-lib"
 echo "# GENERATED by build_sample.sh -- do not modify." > local.properties
 echo "sdk.dir=${ANDROID_HOME}" >> local.properties
 echo "gpg.lib=${private_lib}" >> local.properties
-${android_tool} update project --path .
+${android_tool} update project --path . --target android-22
 
 #
 # Get a private copy of the library project
@@ -104,13 +97,21 @@ trap cleanup EXIT
 # Copy the lib project and run "android update lib-project" on it.
 # This requires a target, which apparently needs to be android-10.
 cp -r ${lib_project} ${private_lib}
+mkdir  -p libs
+cp -f ${android_support_v4} ./libs
+
 ${android_tool} update lib-project --path ${private_lib} --target android-22
 
 #
 # At last, build!
 #
 echo Building... >&2
-${ndk_build}
+${ndk_build} "$@"
 ant ${mode}
 
+if [ $# -gt 0 ] && [ "$1" = "clean" ]
+then
+  rm -fr obj libs
+  rm -f build.xml proguard-project.txt
+fi
 echo Done >&2
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`set -eua`
`3`	`3`
`4`	`4`	`declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"`