Changeset 5666 for pjproject/trunk/configure-android

Timestamp:

Sep 29, 2017 2:30:23 AM (7 years ago)

Author:

riza

Message:

Close #2047: Use android ndk binutils when building with --use-ndk-cflags options.

File:

• pjproject/trunk/configure-android (modified) (2 diffs)

pjproject/trunk/configure-android

@@ -77 +77 @@
   fi
 
-  echo "====="
-  echo "NDK_OUT : ${NDK_OUT}"
-  echo "====="
+  # echo "====="
+  # echo "NDK_OUT : ${NDK_OUT}"
+  # echo "====="
 
   for i in $NDK_OUT; do
@@ -142 +142 @@
     export LDFLAGS="${LDFLAGS} --sysroot=${ANDROID_SYSROOT}"
   else
-    #export AR="${NDK_TOOLCHAIN}/bin/${NDK_TARGET}-ar"
-    #export RANLIB="${NDK_TOOLCHAIN}/bin/${NDK_TARGET}-ranlib"
+    # find ar and ranlib
+    TC_AR=`find ${NDK_TOOLCHAIN}/bin/ -name "*-ar" | grep -v "gcc"`
+    TC_RANLIB=`find ${NDK_TOOLCHAIN}/bin/ -name "*-ranlib" | grep -v "gcc"`
+    if test "x${TC_AR}" != "x" -a "x${TC_RANLIB}" != "x"; then
+      export AR=$TC_AR
+      export RANLIB=$TC_RANLIB
+    fi 
     TARGET_HOST="arm-linux-androideabi"
     export LDFLAGS="${LDFLAGS} --sysroot=${ANDROID_SYSROOT} -target ${NDK_TARGET} -gcc-toolchain ${NDK_TOOLCHAIN}"