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 12226) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/android-sdk/install.sh (revision 12227) @@ -1,7 +1,7 @@ #This installs the Android SDK (Software Development Kit) #which is needed for the compilation of the Java project. -step=1; +step=3; #Different steps here. #1: install sdk, ant and sdk tools @@ -11,6 +11,7 @@ present_dir=`pwd`; default_droid="Android-4.0" +sd_card="issm-sdcard" if [[ $step == "1" ]]; then @@ -61,6 +62,8 @@ #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 + echo "Creating an SD Card" + ./mksdcard -l $sd_card 2G $ANDROID_DIR/android-emulators/$sd_card.img fi if [[ $step == "3" ]]; then @@ -69,11 +72,14 @@ #a terminal in our device. cd $present_dir/install-sdk/tools - ./emulator -avd $default_droid -sdcard $ANDROID_DIR/android-emulators/test & + ./emulator -avd $default_droid -sdcard $ANDROID_DIR/android-emulators/$sd_card.img & cd ../platform-tools - ./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 fi if [[ $step == "4" ]]; then Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh (revision 12226) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh (revision 12227) @@ -4,6 +4,10 @@ --prefix=$ISSM_DIR \ --host="arm-linux" \ --without-modules \ + CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \ + GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \ + CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++ \ --with-vendor=arm-linux \ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ - --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install + --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\ + --without-fortran-lib Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 12226) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 12227) @@ -9,7 +9,7 @@ AC_PROG_CC([cccl cl icl gcc]) AC_PROG_CPP AC_PROG_CXX([cccl cl icl g++]) -AC_PROG_F77([ifort g77 gfortran]) +#AC_PROG_F77([ifort g77 gfortran]) #Libraries and linking AC_PROG_RANLIB AC_F77_LIBRARY_LDFLAGS