Changeset 14088

Timestamp:

12/01/12 23:09:13 (12 years ago)

Author:

Eric.Larour

Message:

CHG: introduced android ndk for include files. Goal is to be able to use android logging

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/configs/config-arm-linux.sh

@@ -6 +6 @@
     --host="arm-linux-androideabi" \
     --enable-shared \
-    --with-android=jni\
+    --with-android=jni \
+        --with-android-ndk=$ISSM_DIR/externalpackages/android/android-ndk/install \
     --without-fortran \
         --without-wrappers \

issm/trunk-jpl/m4/issm_options.m4

@@ -1326 +1326 @@
                 dnl defaults
                 HAVE_ANDROID=jni
-
                 AC_DEFINE([_HAVE_ANDROID_],[1],[with android capability])
+                AC_DEFINE([_HAVE_ANDROID_JNI_],[1],[with android jni])
         elif test "x$ANDROID" = "xexe"; then
                 dnl defaults
@@ -1342 +1342 @@
         AM_CONDITIONAL([ANDROIDEXE], [test x$HAVE_ANDROID = xexe])
         AC_MSG_RESULT($HAVE_ANDROID)
+        dnl }}}
+        dnl with-android-ndk{{{
+        AC_ARG_WITH([android-ndk],
+          AS_HELP_STRING([--with-android-ndk=DIR], [android-ndk root directory.]),
+          [ANDROID_NDK_ROOT=$withval],[ANDROID_NDK_ROOT=""]) 
+        AC_MSG_CHECKING(with android ndk)
+        
+        if test -d "$ANDROID_NDK_ROOT"; then
+                dnl defaults
+                HAVE_ANDROID_NDK=yes
+                ANDROID_NDKINCL="-I$ANDROID_NDK_ROOT/arm-linux-android-install/sysroot/usr/include"
+
+                AC_DEFINE([_HAVE_ANDROID_NDK_],[1],[with android ndk in ISSM src])
+                AC_SUBST([ANDROID_NDKINCL])
+        else
+                HAVE_ANDROID_NDK=no
+        fi
+        AC_MSG_RESULT($HAVE_ANDROID_NDK)
         dnl }}}
         dnl with-3d{{{