Update Android.mk to make it build for multiarch

build-android/jni/Android.mk

@@ -4,12 +4,10 @@
 # see LICENSE.txt
 LOCAL_PATH := $(call my-dir)
 
-LIBETPAN_PATH:=  $(LOCAL_PATH)/../../../pEpJNIAdapter/android/external/libetpan/build-android
-
 include $(CLEAR_VARS)
 
-ifeq ($(LIBETPAN_PATH),)
-$(error LIBETPAN_PATH must be set)
+ifeq ($(GPGBUILD),)
+$(error GPGBUILD must be set)
 endif
 
 LOCAL_MODULE    := pEpEngine
@@ -25,9 +23,8 @@ LOCAL_CFLAGS    += -std=c99
 LOCAL_CFLAGS    += -DSQLITE_TEMP_STORE=3 -DUSE_SEQUOIA
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../asn.1 \
-                    $(GPGME_INCLUDE_PATH) \
-                    $(LIBETPAN_PATH)/include
-LOCAL_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/app_opt/include
+
+LOCAL_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/include
 
 $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)../../)
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include

build-android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_OPTIM := debug
 APP_PLATFORM=android-21
-APP_ABI := arm64-v8a
+#APP_ABI := arm64-v8a
 NDK_TOOLCHAIN_VERSION = clang