diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
| commit | 31f6eab32a26a658cbfb2db0d457cc1f87d23f0f (patch) | |
| tree | 75f372ff22a94102ef2f9bd163febf54ac45e9d6 /app/jni | |
| parent | 6057466bc8b4475bf4564b9143c60753c90f9aaa (diff) | |
| parent | 7d8cde4f7ae769a3b6a25483d8bd0bb6c1551af9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/jni')
| -rw-r--r-- | app/jni/Android.mk | 6 | ||||
| -rw-r--r-- | app/jni/Application.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk index a3280bd6..33d0bc76 100644 --- a/app/jni/Android.mk +++ b/app/jni/Android.mk @@ -5,8 +5,8 @@ JNI_DIR := $(call my-dir) #WITH_POLAR=1 #WITH_OPENVPN3=1 # Build openvpn with polar (OpenVPN3 core is always build with polar) -USE_BREAKPAD=0 -WITH_BREAKPAD=0 +#WITH_BREAKPAD=0 + include lzo/Android.mk include snappy/Android.mk @@ -16,7 +16,7 @@ include openssl/Android.mk ifneq ($(USE_BREAKPAD),0) ifneq ($(TARGET_ARCH),mips) WITH_BREAKPAD=1 -# include google-breakpad/android/google_breakpad/Android.mk + include google-breakpad/android/google_breakpad/Android.mk else WITH_BREAKPAD=0 endif diff --git a/app/jni/Application.mk b/app/jni/Application.mk index 913e0a98..718e79a8 100644 --- a/app/jni/Application.mk +++ b/app/jni/Application.mk @@ -8,4 +8,4 @@ APP_STL:=stlport_shared #LOCAL_ARM_MODE := arm -#NDK_TOOLCHAIN_VERSION=clang +#NDK_TOOLCHAIN_VERSION=clang
\ No newline at end of file |