Index: /issm/trunk-jpl/externalpackages/android-sdk/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/android-sdk/install.sh	(revision 11717)
+++ /issm/trunk-jpl/externalpackages/android-sdk/install.sh	(revision 11718)
@@ -2,5 +2,5 @@
 #which is needed for the compilation of the Java project. 
 
-step=1;
+step=3;
 
 #Different steps here. 
@@ -11,4 +11,5 @@
 
 present_dir=`pwd`;
+default_droid="Android-4.0.3"
 
 if [[ $step == "1" ]]; then
@@ -31,7 +32,9 @@
 	#For now, we need to install:  
 	#android sdk platform tools  
-	#a specific android api: API 15
+	#and a specific android api: API 15
+	#Note: API 15 corresponds to Android 4.0.3
 
-	cd install-sdk/tools/ && source ./android
+	cd install-sdk/tools/ && source ./android update sdk -t platform-tools,android-15 --no-ui
+
 fi
 
@@ -42,7 +45,14 @@
 	#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
-	./android avd
-	mv ~/.android/avd/Android-4.0.3.*  $ISSM_TIER/externalpackages/android-emulators
+	./android delete avd -n $default_droid
+
+	#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 
+	./android move avd -n Android-4.0.3 -p $ISSM_TIER/externalpackages/android-emulators/$default_droid
 
 fi
@@ -51,7 +61,6 @@
 if [[ $step == "3" ]]; then
 	
-	cd $present_dir/install-sdk/platform-tools
-	./adb -p "$ISSM_TIER/externalpackages/android-emulators" devices
-
+	cd $present_dir/install-sdk/tools
+	./emulator -avd $default_droid
 fi