Changeset 12607

Timestamp:

07/03/12 16:19:38 (13 years ago)

Author:

glperez

Message:

Changes to Android SDK and GSL install scripts.

Location:

issm/trunk-jpl/externalpackages

Files:

• android/android-sdk/install.sh (modified) (3 diffs)
• android/android_variables.sh (modified) (1 diff)
• gsl/install-android.sh (modified) (1 diff)

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

@@ -14 +14 @@
 sd_card="issm-sdcard"
 
-((tmp=$1- 3)) 
+((tmp=$1 )) 
 
-if [[ $tmp -ge "-2" && $tmp -le "3" ]]; then
+if [[ $tmp -ge "1" && $tmp -le "4" ]]; then
     step=$1
 else
@@ -25 +25 @@
 
         #Cleanup the install
-        rm -rf install-sdk install-ant
+        rm -rf install-sdk
 
         #Download from ISSM server
@@ -81 +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

issm/trunk-jpl/externalpackages/android/android_variables.sh

@@ -2 +2 @@
 ndk_rev=8
 api_levels="android-14,android-15,android-16"
-host_triplet=""
+host_triplet="arm-linux-androideabi"
 default_droid="android-4.1"
-toolchain_path=${ANDROID_DIR}"/arm-linux-"${default_droid}"/bin/arm-linux-androideabi"

issm/trunk-jpl/externalpackages/gsl/install-android.sh

@@ -20 +20 @@
 
 ./configure \
-    CC=${toolchain_path}-gcc\
-    LD=${toolchain_path}-ld\
-    AR=${toolchain_path}-ar\
-    RANLIB=${toolchain_path}-ranlib\
-    NM=${toolchain_path}-nm\
-    OBJ_EXT=o\
-    LIB_EXT=a\
-    --host="arm-linux"\
+    --build="i386-apple-darwin10.8.0" \
+    --host=$host_triplet\
         --prefix="$ISSM_DIR/externalpackages/gsl/install"