android: Get the port up and running again

The build system needed fixes because the tools paths changed and one tool that
we used (apkbuilder) was removed entirely. Recent NDKs don't ship gcc 4.4.3
anymore, therefore switch to 4.6. The code itself needed a fix for a jni
reference bug that was uncovered by KitKat.

The port now builds with latest sdk (r22) and ndk (r9d).

Change-Id: Id74fa54ba93bbb0ee30373fbe79e92c5ff03201d

1 files changed, 2 insertions, 4 deletions

diff --git a/tools/configure b/tools/configure
index 73a8cae42d..5b3419d771 100755
--- a/tools/configure
+++ b/tools/configure
@@ -673,11 +673,11 @@ androidcc () {
     LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog"
     GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared"
     ANDROID_ARCH=$1 # for android.make too
+    gccchoice="4.6"
     # arch dependant stuff
     case $ANDROID_ARCH in
         armeabi)
             endian="little"
-            gccchoice="4.4.3"
             gcctarget="arm-linux-androideabi-"
             # sigaltstack is not available in pre-android-9, however asm
             # threads work fine so far
@@ -688,7 +688,6 @@ androidcc () {
             ;;
         mips)
             endian="little"
-            gccchoice="4.4.3"
             gcctarget="mipsel-linux-android-"
             thread_support="HAVE_SIGALTSTACK_THREADS"
             GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \
@@ -696,8 +695,7 @@ androidcc () {
             LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips"
             ;;
         x86)
-            endian=little
-            gccchoice="4.4.3"
+            endian="little"
             gcctarget="i686-linux-android-"
             gccdir=x86-$gccchoice
             thread_support="HAVE_SIGALTSTACK_THREADS"