Changeset 12503 for issm/trunk-jpl/externalpackages/android/android-sdk

Timestamp:

06/21/12 15:13:48 (13 years ago)

Author:

glperez

Message:

Minor revision of Android-SDK install script.

File:

• issm/trunk-jpl/externalpackages/android/android-sdk/install.sh (modified) (3 diffs)

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

@@ -2 +2 @@
 #which is needed for the compilation of the Java project. 
 
-step=3;
+step=1;
 
 #Different steps here. 
@@ -20 +20 @@
 
         #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_r18-macosx.zip' 'android-sdk_r18-macosx.zip'
 
         # Install Android SDK and NDK.
-        unzip -o android-sdk-r16-macosx.zip
+        unzip -o android-sdk_r18-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
+        mv -f android-sdk-macosx install-sdk
+        mv -f apache-ant-1.8.2 install-ant
 
         #Post_install configuration: 
@@ -37 +36 @@
         #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 15 and API 14
+        #Note: API 15 and 14 correspond to Android 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