Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/install.sh
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/install.sh	(revision 0)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/install.sh	(revision 12097)
@@ -0,0 +1,78 @@
+#This installs the Android SDK (Software Development Kit)
+#which is needed for the compilation of the Java project. 
+
+step=3;
+
+#Different steps here. 
+#1: install sdk, ant and sdk tools
+#2: install an emulator.
+#3: test the emulator
+#4: cleanup
+
+present_dir=`pwd`;
+default_droid="Android-4.0"
+
+if [[ $step == "1" ]]; then
+
+	#Cleanup the install
+	rm -rf install-sdk install-ant
+
+	# Install Android SDK and NDK.
+	unzip -o android-sdk-r16-macosx.zip
+	unzip -o apache-ant-1.8.2-bin.zip
+
+	#Move to install
+	mv android-sdk-macosx install-sdk
+	mv apache-ant-1.8.2 install-ant
+
+	#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 15
+	#Note: API 15 corresponds to Android 4.0.3
+
+	cd install-sdk/tools/ && source ./android update sdk -t platform-tools,android-15,android-14,system-image --no-ui
+
+fi
+
+if [[ $step == "2" ]]; then
+
+	#Once this is done, we need to install an emulator. Location will default to ~/.android/avd, 
+	#which we will move to $ISSM_TIER/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
+fi
+
+if [[ $step == "3" ]]; 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/test &
+
+    cd ../platform-tools
+    ./adb wait-for-device shell
+
+fi
+
+if [[ $step == "4" ]]; then
+	rm -rf install-sdk install-ant
+fi

Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/install.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/apache-ant-1.8.2-bin.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/apache-ant-1.8.2-bin.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/android-sdk-r16-macosx.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/android-sdk-r16-macosx.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk
___________________________________________________________________
Added: svn:ignore
   + install-sdk
install-ant


Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-ndk/install.sh
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-ndk/install.sh	(revision 0)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-ndk/install.sh	(revision 12097)
@@ -0,0 +1,22 @@
+#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-r7b-darwin-x86.tar.bz2 dummy.tar.bz2 file was downloaded 
+#from the android developer website: 
+
+#Cleanup the install
+rm -rf install
+rm -rf $ANDROID_DIR/arm-linux-android-4.0
+
+# Install Android SDK and NDK.
+cp android-ndk-r7b-darwin-x86.tar.bz2 dummy.tar.bz2
+bunzip2 dummy.tar.bz2
+tar -xvf dummy.tar
+rm -rf dummy.tar dummy.tar.bz2
+
+#Move to install
+mv android-ndk-r7b install
+
+#Create Standalone Development Directory
+$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-5 --install-dir=$ANDROID_DIR/arm-linux-android-4.0

Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-ndk/install.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-ndk/android-ndk-r7b-darwin-x86.tar.bz2
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-ndk/android-ndk-r7b-darwin-x86.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/etc/environment_variables.sh
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/etc/environment_variables.sh	(revision 12096)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/etc/environment_variables.sh	(revision 12097)
@@ -172,17 +172,17 @@
 #packagemaker
 PACKAGEMAKER_DIR="$ISSM_TIER/externalpackages/packagemaker/install"
 
+#android-dev-dir
+ANDROID_DIR="$ISSM_TIER/externalpackages/android"
+
 #android-ndk
-ANDROID_NDK_DIR="$ISSM_TIER/externalpackages/android-ndk/install"
+ANDROID_NDK_DIR="$ANDROID_DIR/android-ndk/install"
 
-#android-dev-dir
-ANDROID_DEV_DIR="$ISSM_TIER/externalpackages/android-dev-dir"
-
 #android-sdk
-ANDROID_SDK_DIR="$ISSM_TIER/externalpackages/android-sdk/install-sdk"
+ANDROID_SDK_DIR="$ANDROID_DIR/android-sdk/install-sdk"
 
 #android-ant
-ANDROID_ANT_DIR="$ISSM_TIER/externalpackages/android-sdk/install-ant"
+ANDROID_ANT_DIR="$ANDROID_DIR/android-sdk/install-ant"
 
 #gsl
 GSL_DIR="$ISSM_TIER/externalpackages/gsl/install"
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/etc/environment.sh
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/etc/environment.sh	(revision 12096)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/etc/environment.sh	(revision 12097)
@@ -241,8 +241,8 @@
 export ANDROID_NDK_DIR
 export PATH="$PATH:$ANDROID_NDK_DIR/"
 
-#ANDROID_DEV_DIR
-export ANDROID_DEV_DIR
+#ANDROID_DIR
+export ANDROID_DIR
 
 #ANDROID_SDK
 export PATH="$PATH:$ANDROID_SDK_DIR/"