Android : now libetpan path must be specified in LIBETPAH_PATH env var, and is not anymore ../libetpan
authorEdouard Tisserant
Tue, 06 Oct 2015 15:01:34 +0200
changeset 369906f46ffd840
parent 368 c8302f5536c3
child 370 e64de95cd36c
Android : now libetpan path must be specified in LIBETPAH_PATH env var, and is not anymore ../libetpan
.hgignore
build-android/build.sh
     1.1 --- a/.hgignore	Mon Oct 05 19:41:46 2015 +0200
     1.2 +++ b/.hgignore	Tue Oct 06 15:01:34 2015 +0200
     1.3 @@ -14,4 +14,5 @@
     1.4  *.lib
     1.5  *.obj
     1.6  build-android/pEpEngine-android-1.zip
     1.7 -
     1.8 +build-android/third-party
     1.9 +build-android/pEpEngine-android-1
     2.1 --- a/build-android/build.sh	Mon Oct 05 19:41:46 2015 +0200
     2.2 +++ b/build-android/build.sh	Tue Oct 06 15:01:34 2015 +0200
     2.3 @@ -11,7 +11,6 @@
     2.4  package_name=pEpEngine-android
     2.5  
     2.6  current_dir="`pwd`"
     2.7 -libetpan_dir="$current_dir/../../libetpan/build-android"
     2.8  
     2.9  if test "x$ANDROID_NDK" = x ; then
    2.10    echo should set ANDROID_NDK before running this script.
    2.11 @@ -23,6 +22,13 @@
    2.12    exit 1
    2.13  fi
    2.14  
    2.15 +if test "x$LIBETPAN_PATH" = x ; then
    2.16 +  echo should set LIBETPAN_PATH before running this script.
    2.17 +  exit 1
    2.18 +fi
    2.19 +
    2.20 +libetpan_dir=$LIBETPAN_PATH
    2.21 +
    2.22  function build {
    2.23    rm -rf "$current_dir/obj"
    2.24