Changeset 6033

Timestamp:

Jun 21, 2019 4:30:42 AM (5 years ago)

Author:

ming

Message:

Fixed #2208: Change default arch for Android and iOS to 64-bit

Location:

pjproject/trunk

Files:

• configure-android (modified) (2 diffs)
• configure-iphone (modified) (2 diffs)

pjproject/trunk/configure-android

@@ -22 +22 @@
   echo "                   maximum platform level detected."
   echo "  TARGET_ABI       Optionally specify a single target architecture,"
-  echo "                   e.g. armeabi-v7a, mips, x86. By default, the target"
-  echo "                   architecture is armeabi. Only used when"
-  echo "                   --use-ndk-cflags is specified."
+  echo "                   e.g. armeabi-v7a, arm64-v8a, mips, x86. By default, "
+  echo "                   the target architecture is arm64-v8a."
   echo "  IGNORE_CFLAGS    Optionally specify compilation flags to be ignored."
   echo "                   Each grepped flag that satisfies the criteria will"
@@ -50 +49 @@
 
 if test "x$TARGET_ABI" = "x"; then
-  # armeabi was removed since NDK r17
-  if [ "${NDK_VER}" -ge "17" ]; then
-    TARGET_ABI="armeabi-v7a"
-  else
-    TARGET_ABI="armeabi"
-  fi
+  TARGET_ABI="arm64-v8a"
   echo "$F: TARGET_ABI not specified, using ${TARGET_ABI}"
 fi

pjproject/trunk/configure-iphone

@@ -19 +19 @@
   echo "             SDK."
   echo "  ARCH       Optional flags to specify target architecture, e.g."
-  echo "             ARCH=\"-arch armv6\". Default is armv7."
+  echo "             ARCH=\"-arch armv7\". Default is arm64."
   echo "  MIN_IOS    Optional flags to specify minimum supported iOS"
   echo "             versions, e.g. MIN_IOS=\"-miphoneos-version-min=10.0\". "
@@ -114 +114 @@
 
 if test "${ARCH}" = ""; then
-  export ARCH="-arch armv7"
+  export ARCH="-arch arm64"
   echo "$F: ARCH is not specified, choosing ${ARCH}"
 fi