Index: ../trunk-jpl/etc/environment.sh
===================================================================
--- ../trunk-jpl/etc/environment.sh	(revision 13643)
+++ ../trunk-jpl/etc/environment.sh	(revision 13644)
@@ -186,10 +186,13 @@
 PACKAGEMAKER_DIR="$ISSM_DIR/externalpackages/packagemaker/install"
 pathappend "$PACKAGEMAKER_DIR"
 
-ANDROID_NDK_DIR="$ISSM_DIR/externalpackages/android-ndk/install"
+#android-dev-dir
+export ANDROID_DIR="$ISSM_DIR/externalpackages/android"
+
+ANDROID_NDK_DIR="$ANDROID_DIR/android-ndk/install"
 pathappend "$ANDROID_NDK_DIR/"
 
-ANDROID_SDK_DIR="$ANDROID_DIR/android-sdk/install-sdk"
+ANDROID_SDK_DIR="$ANDROID_DIR/android-sdk/install"
 pathappend "$ANDROID_SDK_DIR/"
 
 GSL_DIR="$ISSM_DIR/externalpackages/gsl/install"