Android : build script now needs GPGME_INCLUDE_PATH env var to be set.
authorEdouard Tisserant
Sat, 26 Sep 2015 20:18:22 +0200
changeset 353f1ca187ee8cb
parent 352 d579d4c03cf4
child 355 d12fe5ea49e0
Android : build script now needs GPGME_INCLUDE_PATH env var to be set.
build-android/build.sh
build-android/jni/Android.mk
     1.1 --- a/build-android/build.sh	Tue Sep 22 10:24:04 2015 +0200
     1.2 +++ b/build-android/build.sh	Sat Sep 26 20:18:22 2015 +0200
     1.3 @@ -1,5 +1,7 @@
     1.4  #!/bin/sh
     1.5  
     1.6 +set -e
     1.7 +
     1.8  build_version=1
     1.9  ANDROID_PLATFORM=android-21
    1.10  openssl_build_version=1
    1.11 @@ -16,6 +18,11 @@
    1.12    exit 1
    1.13  fi
    1.14  
    1.15 +if test "x$GPGME_INCLUDE_PATH" = x ; then
    1.16 +  echo should set GPGME_INCLUDE_PATH before running this script.
    1.17 +  exit 1
    1.18 +fi
    1.19 +
    1.20  function build {
    1.21    rm -rf "$current_dir/obj"
    1.22    
     2.1 --- a/build-android/jni/Android.mk	Tue Sep 22 10:24:04 2015 +0200
     2.2 +++ b/build-android/jni/Android.mk	Sat Sep 26 20:18:22 2015 +0200
     2.3 @@ -16,6 +16,10 @@
     2.4  $(error LIBETPAN_PATH must be set)
     2.5  endif
     2.6  
     2.7 +ifeq ($(GPGME_INCLUDE_PATH),)
     2.8 +$(error GPGME_INCLUDE_PATH must be set)
     2.9 +endif
    2.10 +
    2.11  LOCAL_MODULE    := pEpEngine
    2.12  LOCAL_CFLAGS    += -std=c99
    2.13  LOCAL_SRC_FILES := ../../src/bloblist.c \
    2.14 @@ -38,7 +42,7 @@
    2.15                     ../../src/transport.c
    2.16  
    2.17  LOCAL_C_INCLUDES := ../../src \
    2.18 -                    ../../../gnupg-for-android/external/data/data/info.guardianproject.gpg/app_opt/include \
    2.19 +                    $(GPGME_INCLUDE_PATH) \
    2.20                      $(OPENSSL_PATH)/include \
    2.21                      $(CYRUS_SASL_PATH)/include \
    2.22                      $(LIBETPAN_PATH)/include