Index: sm/branches/trunk-jpl-damage/externalpackages/android/README
===================================================================
--- /issm/branches/trunk-jpl-damage/externalpackages/android/README	(revision 13117)
+++ 	(revision )
@@ -1,19 +1,0 @@
-//Written by: Gilberto Perez
-//Last Modified 2/21/2012
-/*
- * This is a temporary readme file for the installation of the Android emulator.
- */
-1) Download the Android SDK <http://developer.android.com/sdk/index.html>. 
-2) Add to your PATH the following:
-	ANDROID_HOME=~/android-sdk-macosx
-	PATH=${PATH}:ANDROID_HOME/platforms/android-15/:~ANDROID_HOME/platform-tools/:ANDROID_HOME/tools/
-3) Run Android and install the newest Android distribution(as of the last update: android-15)
-4) Navigate to the project directory and run Android update project ./
-5) Run ant debug.
-6) Initiate an emulator by entering:
-	1) android list targets (this will produce a list of available of system image targets)
-	2) android create avd -n <name> -t<targetID> (Choose targetID to match android-15)
-7) Start up the emulator by entering: emulator -avd <avd_name>
-8) Install the app by entering: adb install <path_to_your_bin>.apk
-
-The app should be installed and ready to run from the virtual device!
Index: /issm/branches/trunk-jpl-damage/externalpackages/android/android-ndk/install.sh
===================================================================
--- /issm/branches/trunk-jpl-damage/externalpackages/android/android-ndk/install.sh	(revision 13118)
+++ /issm/branches/trunk-jpl-damage/externalpackages/android/android-ndk/install.sh	(revision 13118)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# This installs the Android NDK (Native Development Kit)
+# which is needed for the compilation of C/C++ code into the 
+# native architecture of the Android device.
+
+# The android-ndk-r8-darwin-x86.tar.bz2 ndk.tar.bz2 file was downloaded 
+# from the android developer website: 
+source $ANDROID_DIR/android_aux.sh
+
+if [[ $step == "1" || $step == "0" ]]; then
+    # Cleanup the install
+    rm -rf install
+    rm -rf $ANDROID_DIR/arm-linux-android-${default_droid}
+
+    # Download from ISSM server
+    $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-ndk-r'${ndk_rev}'-darwin-x86.tar.bz2' 'ndk.tar.bz2'
+
+    # Untar
+    tar -zxvf ndk.tar.bz2
+    rm -rf ndk.tar ndk.tar.bz2
+
+    # Move to install
+    mv android-ndk-r${ndk_rev} install
+fi
+
+# Create Standalone Development Directory
+# Note: API-14 corresponds to Android 4.0.
+if [[ $step == "2" || $step == "0" ]]; then
+    $ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=$ANDROID_DIR/arm-linux-android-4.0
+fi
Index: /issm/branches/trunk-jpl-damage/externalpackages/android/android-sdk/install.sh
===================================================================
--- /issm/branches/trunk-jpl-damage/externalpackages/android/android-sdk/install.sh	(revision 13118)
+++ /issm/branches/trunk-jpl-damage/externalpackages/android/android-sdk/install.sh	(revision 13118)
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# This installs the Android SDK (Software Development Kit)
+# which is needed for the compilation of the Java project. 
+
+source $ANDROID_DIR/android_aux.sh
+
+# Different steps here. 
+#   0: do all
+#   1: install sdk, ant and sdk tools
+#   2: install an emulator.
+#   3: test the emulator
+#   4: cleanup
+
+present_dir=`pwd`;
+sd_card="issm-sdcard"
+
+if [[ $step == "1" || $step == "0" ]]; then
+
+	# Cleanup the install
+	rm -rf install-sdk
+
+	# Download from ISSM server
+	$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-sdk_r'$sdk_rev'-macosx.zip' 'android-sdk_r'${sdk_rev}'-macosx.zip'
+
+	# Install Android SDK and NDK.
+	unzip -o android-sdk_r${sdk_rev}-macosx.zip
+
+	# Move to install
+	mv -f android-sdk-macosx install-sdk
+
+	# Post_install configuration: 
+	# We need specific settings for specific platforms, for the SDK to 
+	# function properly
+
+	# For now, we need to install:  
+	# android sdk platform tools  
+	# and a specific android api: API 16, API 15 and API 14
+	# Note: API 16, API 15 and 14 correspond to Android 4.1, 4.0.3 and 4.0 respectively. 
+
+	cd install-sdk/tools/ && source ./android update sdk -t platform-tool,${api_levels},system-image --no-ui
+
+fi
+
+if [[ $step == "2" || $step == "0" ]]; then
+
+	# Once this is done, we need to install an emulator. Location will default to ~/.android/avd, 
+	# which we will move to $ISSM_DIR/externalpackages/android-emulators.  
+	# For now, it's called: Android-4.0.3
+
+	# Here we delete the Android-4.0.3 device if it already exists.
+	cd $present_dir/install-sdk/tools
+
+    if [ -e $ANDROID_DIR/android-emulators/$default_droid ] 
+    then
+        echo "Deleting previously created device: $default_droid"
+	    ./android delete avd -n $default_droid
+    fi
+
+	# Android will prompt the user to specify hardware emulation options. For now, default
+	# default settings will suffice. Press 'enter' to take default settings or enter 'no'.
+
+	./android create avd -f -n $default_droid -t 1 -p $ANDROID_DIR/android-emulators/$default_droid --abi armeabi-v7a
+    echo "Creating an SD Card"
+    ./mksdcard -l $sd_card 2G $ANDROID_DIR/android-emulators/$sd_card.img
+fi
+
+if [[ $step == "3" || $step == "0" ]]; then
+    # Here we will start up our default emulator to test that it is working properly.
+    # Once the device has booted we will use the Android Debug Bridge tool to gain
+    # a terminal in our device.
+
+	cd $present_dir/install-sdk/tools
+	./emulator -avd $default_droid -sdcard $ANDROID_DIR/android-emulators/$sd_card.img &
+
+    cd ../platform-tools
+    ./adb wait-for-device shell
+fi
+
+if [[ $step == "4" || $step == "0" ]]; then
+	rm -rf install-sdk
+fi