Build using sequoia on Android sync
authorHussein Kasem <huss@pep-project.org>
Thu, 25 Apr 2019 12:09:53 +0200
branchsync
changeset 37416f92319aefbb
parent 3739 523fb9710660
child 3742 37d915105396
Build using sequoia on Android
build-android/jni/Android.mk
build-android/jni/Application.mk
     1.1 --- a/build-android/jni/Android.mk	Tue May 21 07:04:51 2019 +0200
     1.2 +++ b/build-android/jni/Android.mk	Thu Apr 25 12:09:53 2019 +0200
     1.3 @@ -5,7 +5,6 @@
     1.4  LOCAL_PATH := $(call my-dir)
     1.5  
     1.6  LIBETPAN_PATH:=  $(LOCAL_PATH)/../../../pEpJNIAdapter/android/external/libetpan/build-android
     1.7 -GPGME_INCLUDE_PATH:=  $(LOCAL_PATH)/../../../pEpJNIAdapter/android/external/data/data/pep.android.k9/app_opt/include
     1.8  
     1.9  include $(CLEAR_VARS)
    1.10  
    1.11 @@ -13,10 +12,6 @@
    1.12  $(error LIBETPAN_PATH must be set)
    1.13  endif
    1.14  
    1.15 -ifeq ($(GPGME_INCLUDE_PATH),)
    1.16 -$(error GPGME_INCLUDE_PATH must be set)
    1.17 -endif
    1.18 -
    1.19  LOCAL_MODULE    := pEpEngine
    1.20  LOCAL_CFLAGS    += -std=c99
    1.21  
    1.22 @@ -27,17 +22,18 @@
    1.23  # Android has no globally writable temp directory, if this is not defined the
    1.24  # application throws an exception when it tries to create a temp file.
    1.25  #
    1.26 -LOCAL_CFLAGS    += -DSQLITE_TEMP_STORE=3
    1.27 +LOCAL_CFLAGS    += -DSQLITE_TEMP_STORE=3 -DUSE_SEQUOIA
    1.28  
    1.29  LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../asn.1 \
    1.30                      $(GPGME_INCLUDE_PATH) \
    1.31                      $(LIBETPAN_PATH)/include
    1.32 -LOCAL_C_INCLUDES += $(GPGBUILD)/include
    1.33 +LOCAL_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/app_opt/include
    1.34  
    1.35  $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)../../)
    1.36  LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
    1.37  
    1.38 -ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*sequoia*" ! -name "*netpgp*" -name "*.c")
    1.39 +#ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*sequoia*" ! -name "*netpgp*" -name "*.c")
    1.40 +ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*gpg*" ! -name "*netpgp*" -name "*.c")
    1.41  #ENGINE_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.c)
    1.42  ASN1_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../asn.1/*.c)
    1.43  LOCAL_SRC_FILES := $(ENGINE_SRC_FILES:%=%)  $(ASN1_SRC_FILES:$(LOCAL_PATH)/%=%)
     2.1 --- a/build-android/jni/Application.mk	Tue May 21 07:04:51 2019 +0200
     2.2 +++ b/build-android/jni/Application.mk	Thu Apr 25 12:09:53 2019 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4  APP_OPTIM := debug
     2.5  APP_PLATFORM=android-21
     2.6 -APP_ABI := armeabi-v7a
     2.7 +APP_ABI := arm64-v8a
     2.8  NDK_TOOLCHAIN_VERSION = clang