source: issm/oecreview/Archive/11821-11840/ISSM-11825-11826.diff

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android-sdk/install.sh
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android-sdk/install.sh   (revision 11825)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android-sdk/install.sh   (revision 11826)
@@ -1,7 +1,7 @@
 #This installs the Android SDK (Software Development Kit)
 #which is needed for the compilation of the Java project. 
 
-step=3;
+step=2;
 
 #Different steps here. 
 #1: install sdk, ant and sdk tools
@@ -47,21 +47,24 @@
 
        #Here we delete the Android-4.0.3 device if it already exists.
        cd $present_dir/install-sdk/tools
-       ./android delete avd -n $default_droid
 
+    if [ -e $ISSM_TIER/externalpackages/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 
-       ./android move avd -n Android-4.0.3 -p $ISSM_TIER/externalpackages/android-emulators/$default_droid
-
+       ./android create avd -f -n $default_droid -t 1 -p $ISSM_TIER/externalpackages/android-emulators/$default_droid --abi armeabi-v7a
 fi
 
-
 if [[ $step == "3" ]]; then
        
        cd $present_dir/install-sdk/tools
        ./emulator -avd $default_droid
+
 fi
 
 if [[ $step == "4" ]]; then