Changeset 12707 for issm/trunk/externalpackages/android/android-sdk

Timestamp:

07/24/12 10:36:46 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• externalpackages/android/android-sdk/install.sh (modified) (4 diffs)

issm/trunk/externalpackages/android/android-sdk/install.sh

@@ -1 +1 @@
 #This installs the Android SDK (Software Development Kit)
 #which is needed for the compilation of the Java project. 
+source $ANDROID_DIR/android_variables.sh
 
-step=3;
+step=1;
 
 #Different steps here. 
@@ -11 +12 @@
 
 present_dir=`pwd`;
-default_droid="Android-4.0"
 sd_card="issm-sdcard"
+
+((tmp=$1 )) 
+
+if [[ $tmp -ge "1" && $tmp -le "4" ]]; then
+    step=$1
+else
+    echo "Using default step: " $step
+fi
 
 if [[ $step == "1" ]]; then
 
         #Cleanup the install
-        rm -rf install-sdk install-ant
+        rm -rf install-sdk
 
         #Download from ISSM server
-        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-sdk-r16-macosx.zip' 'android-sdk-r16-macosx.zip'
-        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/apache-ant-1.8.2-bin.zip' 'apache-ant-1.8.2-bin.zip'
+        $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-r16-macosx.zip
-        unzip -o apache-ant-1.8.2-bin.zip
+        unzip -o android-sdk_r${sdk_rev}-macosx.zip
 
         #Move to install
-        mv android-sdk-macosx install-sdk
-        mv apache-ant-1.8.2 install-ant
+        mv -f android-sdk-macosx install-sdk
 
         #Post_install configuration: 
@@ -37 +42 @@
         #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
+        #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-tools,android-15,android-14,system-image --no-ui
+        cd install-sdk/tools/ && source ./android update sdk -t platform-tool,${api_levels},system-image --no-ui
 
 fi
@@ -76 +81 @@
 
     cd ../platform-tools
-    ./adb wait-for-device shell mount -o rw,remount -t yaffs2 /dev/block/mtdblock1 /system
+    ./adb wait-for-device shell
+    #./adb wait-for-device shell mount -o rw,remount -t yaffs2 /dev/block/mtdblock1 /system
     #./adb wait-for-device shell
-    ./adb push $ISSM_TIER/src/c/issm.exe /data/issm.exe
-    ./adb shell chmod 777 /data/issm.exe
-    ./adb shell /data/issm.exe
+    #./adb push $ISSM_TIER/src/c/issm.exe /data/issm.exe
+    #./adb shell chmod 777 /data/issm.exe
+    #./adb shell /data/issm.exe
 fi
 
 if [[ $step == "4" ]]; then
-        rm -rf install-sdk install-ant
+        rm -rf install-sdk
 fi