android-change_linker_from_gold_to_bfd.diff

diff --git a/tools/configure b/tools/configure
index ec83502..86014fa 100755
--- a/tools/configure
+++ b/tools/configure
@@ -676,7 +676,7 @@ androidcc () {
     fi
     SHARED_LDFLAG="-shared"
     SHARED_CFLAGS=''
-    GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
+    GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack,-fuse-ld=bfd"
     ANDROID_ARCH=$1 # for android.make too
     gccchoice="4.6"
     # arch dependant stuff
@@ -748,7 +748,7 @@ androidndkcc()
     LDOPTS="$LDOPTS -ldl -llog"
     SHARED_LDFLAG="-shared"
     SHARED_CFLAGS=''
-    GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
+    GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack,-fuse-ld=bfd"

     # arch dependant stuff
     case $1 in


android-fix_zipalign_path.diff

diff --git a/android/android.make b/android/android.make
index 6f7cb8a..86909e1 100644
--- a/android/android.make
+++ b/android/android.make
@@ -35,7 +35,7 @@ ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSIO
 BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*)))
 AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt
 DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx
-ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
+ZIPALIGN=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/zipalign
 KEYSTORE=$(HOME)/.android/debug.keystore
 ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
 BUILDAPK=$(ANDROID_DIR)/buildapk.sh


android-update_android_platform_to_android-19.diff

diff --git a/tools/configure b/tools/configure
index ec83502..0f2b60a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -688,16 +688,16 @@ androidcc () {
             # threads work fine so far
             thread_support="ASSEMBLER_THREADS"
             GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
-                    --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm"
-            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm"
+                    --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-arm"
+            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-arm"
             ;;
         mips)
             endian="little"
             gcctarget="mipsel-linux-android-"
             thread_support="HAVE_SIGALTSTACK_THREADS"
             GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \
-                    --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC"
-            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips"
+                    --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-mips -fPIC"
+            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-mips"
             ;;
         x86)
             endian="little"
@@ -705,8 +705,8 @@ androidcc () {
             gccdir=x86-$gccchoice
             thread_support="HAVE_SIGALTSTACK_THREADS"
             GCCOPTS="$GCCOPTS -Wa,--noexecstack -ffunction-sections -fomit-frame-pointer\
-                    --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86"
-            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86"
+                    --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-x86"
+            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-x86"
             ;;
         *)
             echo "ERROR: androidcc(): Unknown target architecture"
@@ -756,8 +756,8 @@ androidndkcc()
             endian="little"
             gccchoice="4.6"
             gcctarget="arm-linux-androideabi-"
-            echo "${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.6 --platform=android-16 --install-dir=${pwd}/android-toolchain"
-            ${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.6 --platform=android-16 --install-dir=${pwd}/android-toolchain
+            echo "${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.6 --platform=android-19 --install-dir=${pwd}/android-toolchain"
+            ${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.6 --platform=android-19 --install-dir=${pwd}/android-toolchain
             if [ ${?} != 0 ]; then
                 exit
             fi


android-use_gcc_4.9.diff

diff --git a/tools/configure b/tools/configure
index 0c04045..4505801 100755
--- a/tools/configure
+++ b/tools/configure
@@ -684,7 +684,7 @@ androidcc () {
     SHARED_CFLAGS=''
     GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
     ANDROID_ARCH=$1 # for android.make too
-    gccchoice="4.6"
+    gccchoice="4.9"
     # arch dependant stuff
     case $ANDROID_ARCH in
         armeabi)
@@ -760,10 +760,10 @@ androidndkcc()
     case $1 in
         armeabi)
             endian="little"
-            gccchoice="4.6"
+            gccchoice="4.9"
             gcctarget="arm-linux-androideabi-"
-            echo "${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.6 --platform=android-16 --install-dir=${pwd}/android-toolchain"
-            ${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.6 --platform=android-16 --install-dir=${pwd}/android-toolchain
+            echo "${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.9 --platform=android-16 --install-dir=${pwd}/android-toolchain"
+            ${make_toolchain} --system=${buildhost} --toolchain=arm-linux-androideabi-4.9 --platform=android-16 --install-dir=${pwd}/android-toolchain
             if [ ${?} != 0 ]; then
                 exit
             fi