From 34fb0eca6eb2cbabd3a0c960e05395c41f67c612 Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Fri, 2 Mar 2018 20:05:27 +0100
Subject: [PATCH] Move from gcc 4.8 to 4.9, update gpgme to 1.8.0 and use NDK14

Because of the gpgme update to 1.8.0 a NDK update was needed, etc.
---
 android/external/Makefile  | 10 ++++++----
 android/jni/Application.mk |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android/external/Makefile b/android/external/Makefile
index 9741947..138be1d 100644
--- a/android/external/Makefile
+++ b/android/external/Makefile
@@ -9,7 +9,7 @@
 # TODO: get params from the outside for multiarch build
 
 NDK_ABI ?= arm
-NDK_TOOLCHAIN_VERSION ?= 4.8
+NDK_TOOLCHAIN_VERSION ?= 4.9
 APP_ABI ?= armeabi-v7a
 APP_PLATFORM ?= android-18
 PEP_PACKAGE_NAME ?= com.pep.k9
@@ -57,8 +57,9 @@ NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(ND
 
 # include Android's build flags
 TARGET_ARCH_ABI = $(APP_ABI)
-#include $(ANDROID_NDK_HOME)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
-include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
+include $(ANDROID_NDK_HOME)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
+#include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
+
 CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT)
 LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld
 AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar
@@ -366,7 +367,7 @@ gnupg-install: $(LOCAL)/bin/gpg2
 #------------------------------------------------------------------------------#
 # gpgme
 
-EXTERNAL_GIT_REPOS += gpgme|git://git.gnupg.org/gpgme.git?gpgme-1.6.0
+EXTERNAL_GIT_REPOS += gpgme|git://git.gnupg.org/gpgme.git?gpgme-1.8.0
 
 gpgme/configure: gpgme.src.stamp gpgme/configure.ac 
 	cd gpgme && ./autogen.sh 
@@ -390,6 +391,7 @@ gpgme/Makefile: gpgme/configure
 				--disable-g13-test \
 				--prefix=$(prefix)
 
+	sed -i $$'s/#define error_t int/#ifndef error_t\\\n#define error_t int\\\n#endif/g' gpgme/config.h
 
 gpgme/src/.libs/libgpgme.so: gpgme/Makefile
 	$(MAKE) -C gpgme
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index c1ce218..f0c0493 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -2,4 +2,4 @@ APP_STL := stlport_static
 APP_OPTIM := debug
 APP_PLATFORM=android-18
 APP_ABI := armeabi-v7a
-NDK_TOOLCHAIN_VERSION = 4.8
+NDK_TOOLCHAIN_VERSION = 4.9