Changeset 12097

Timestamp:

04/20/12 15:33:08 (13 years ago)

Author:

glperez

Message:

Modification to environment variables and file strucutre of Android.

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• etc/environment_variables.sh (modified) (1 diff)
• externalpackages/android (added)
• externalpackages/android-dev-dir (deleted)
• externalpackages/android/android-emulators (copied) (copied from issm/trunk-jpl/externalpackages/android-dev-dir/android-emulators )
• externalpackages/android/android-ndk (moved) (moved from issm/trunk-jpl/externalpackages/android-ndk )
• externalpackages/android/android-ndk/install.sh (modified) (2 diffs)
• externalpackages/android/android-sdk (moved) (moved from issm/trunk-jpl/externalpackages/android-sdk )
• externalpackages/android/android-sdk/install.sh (modified) (3 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -242 +242 @@
 export PATH="$PATH:$ANDROID_NDK_DIR/"
 
-#ANDROID_DEV_DIR
-export ANDROID_DEV_DIR
+#ANDROID_DIR
+export ANDROID_DIR
 
 #ANDROID_SDK

issm/trunk-jpl/etc/environment_variables.sh

@@ -173 +173 @@
 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-dev-dir
-ANDROID_DEV_DIR="$ISSM_TIER/externalpackages/android-dev-dir"
+ANDROID_NDK_DIR="$ANDROID_DIR/android-ndk/install"
 
 #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

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

@@ -8 +8 @@
 #Cleanup the install
 rm -rf install
-rm -rf $ANDROID_DEV_DIR/tmp
+rm -rf $ANDROID_DIR/arm-linux-android-4.0
 
 # Install Android SDK and NDK.
@@ -20 +20 @@
 
 #Create Standalone Development Directory
-$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-5 --install-dir=$ANDROID_DEV_DIR/tmp/android-linux-4.0
+$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-5 --install-dir=$ANDROID_DIR/arm-linux-android-4.0

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

@@ -49 +49 @@
         cd $present_dir/install-sdk/tools
 
-    if [ -e $ANDROID_DEV_DIR/android-emulators/$default_droid ] 
+    if [ -e $ANDROID_DIR/android-emulators/$default_droid ] 
     then
         echo "Deleting previously created device: $default_droid"
@@ -58 +58 @@
         #default settings will suffice. Press 'enter' to take default settings or enter 'no'.
 
-        ./android create avd -f -n $default_droid -t 1 -p $ANDROID_DEV_DIR/android-emulators/$default_droid --abi armeabi-v7a
+        ./android create avd -f -n $default_droid -t 1 -p $ANDROID_DIR/android-emulators/$default_droid --abi armeabi-v7a
 fi
 
@@ -67 +67 @@
 
         cd $present_dir/install-sdk/tools
-        ./emulator -avd $default_droid -sdcard $ANDROID_DEV_DIR/android-emulators/test &
+        ./emulator -avd $default_droid -sdcard $ANDROID_DIR/android-emulators/test &
 
     cd ../platform-tools