Changeset 4221 for pjproject

Timestamp:

Aug 7, 2012 9:06:10 AM (12 years ago)

Author:

ming

Message:

Re #1516: Add help info for configure-android, add support for selecting target architecture

Location:

pjproject/branches/projects/android

Files:

• configure-android (modified) (4 diffs)
• pjlib/include/pj/config_site_sample.h (modified) (1 diff)

pjproject/branches/projects/android/configure-android

@@ -8 +8 @@
   echo ""
   echo "where:"
-  echo "  --use-ndk-cflags"
-  echo "              Optional parameter to use the same compilation flags"
-  echo "              as the one used by ndk-build"
-  echo "  OPTIONS     Other options that will be passed directly to"
-  echo "              ./aconfigure script. Run ./aconfigure --help"
-  echo "              for more info."
+  echo "  --use-ndk-cflags Optional parameter to use the same compilation flags"
+  echo "                   as the one used by ndk-build"
+  echo "  OPTIONS          Other options that will be passed directly to"
+  echo "                   ./aconfigure script. Run ./aconfigure --help"
+  echo "                   for more info."
+  echo ""
+  echo "Environment variables:"
+  echo "  ANDROID_NDK_ROOT Specify the directory of Android NDK to use."
+  echo "  APP_PLATFORM     Optionally specify the platform level used, e.g."
+  echo "                   android-8. By default, configure will use the maximum"
+  echo "                   platform level detected."
+  echo "  TARGET_ABI       Optionally specify a single target architecture, e.g."
+  echo "                   armeabi-v7a. By default, the target architecture is"
+  echo "                   armeabi."
+  echo ""
   exit 0
 fi
 
-if test "x${ANDROID_NDK}" = "x"; then
-  echo "$F error: ANDROID_NDK must be specified"
+if test "x${ANDROID_NDK_ROOT}" = "x"; then
+  echo "$F error: ANDROID_NDK_ROOT must be specified"
   exit 0
 fi
@@ -32 +41 @@
 fi
 
+if test "x$APP_PLATFORM" = "x"; then
+  APP_PLATFORM=`ls ${ANDROID_NDK_ROOT}/platforms/ | sed 's/android-//' | sort -gr | head -1`
+  APP_PLATFORM="android-${APP_PLATFORM}"
+  echo "$F: APP_PLATFORM not specified, using ${APP_PLATFORM}"
+fi
+
+if test "x$TARGET_ABI" = "x"; then
+  TARGET_ABI="armeabi"
+  echo "$F: TARGET_ABI not specified, using ${TARGET_ABI}"
+fi
+
 if test "$1" = "--use-ndk-cflags"; then
   shift
-  for i in `${ANDROID_NDK}/ndk-build --dry-run --directory=${ANDROID_NDK}/samples/hello-jni`; do
+  for i in `${ANDROID_NDK_ROOT}/ndk-build -n -C ${ANDROID_NDK_ROOT}/samples/hello-jni NDK_LOG=1 APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`; do
     if test "$i" = "-c"; then break; fi
     if test "x${NDK_CC}" != "x" -a "$i" != "-MF" -a "x`echo $i|grep '\.o\.d'`" = "x" -a "x`echo $i|grep 'include'`" = "x"; then
@@ -53 +73 @@
 esac
 
-if test "x$API_LEVEL" = "x"; then
-  API_LEVEL=`ls ${ANDROID_NDK}/platforms/ | sed 's/android-//' | sort -gr | head -1`
-  echo "$F: API_LEVEL not specified, using android-${API_LEVEL}"
-fi
-
-ANDROID_TC="${ANDROID_NDK}/toolchains/${TC_DIR}-4.4.3/prebuilt/${BUILD_MACHINE}"
+ANDROID_TC="${ANDROID_NDK_ROOT}/toolchains/${TC_DIR}-4.4.3/prebuilt/${BUILD_MACHINE}"
 if test ! -d ${ANDROID_TC}; then
   echo "$F error: unable to find directory ${ANDROID_TC} in Android NDK"
@@ -64 +79 @@
 fi
 
-export ANDROID_SYSROOT="${ANDROID_NDK}/platforms/android-${API_LEVEL}/arch-arm"
+export ANDROID_SYSROOT="${ANDROID_NDK_ROOT}/platforms/${APP_PLATFORM}/arch-arm"
 if test ! -d ${ANDROID_SYSROOT}; then
   echo "$F error: unable to find sysroot dir ${ANDROID_SYSROOT} in Android NDK"

pjproject/branches/projects/android/pjlib/include/pj/config_site_sample.h

@@ -417 +417 @@
     #define PJSUA_MAX_CONF_PORTS                (PJSUA_MAX_CALLS+2*PJSUA_MAX_PLAYERS)
     #define PJSUA_MAX_BUDDIES                   32
-
-    /* pjsua_app settings */
-    #define USE_GUI                             1
 #endif