diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-21 19:07:50 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-21 19:07:50 -0700 |
| commit | faf864b8a27d94e5db62b37eb98757ad621e1711 (patch) | |
| tree | d3ae465ef645310145d63a4841847cf091c5d8a8 /java/jni | |
| parent | 10564d8e14caad915886ede59a54bcfc0c620f0b (diff) | |
| parent | 8a23d764de82b7902d42f05ca1130847bbfe04af (diff) | |
| download | infinitytier-faf864b8a27d94e5db62b37eb98757ad621e1711.tar.gz infinitytier-faf864b8a27d94e5db62b37eb98757ad621e1711.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'java/jni')
| -rw-r--r-- | java/jni/Application.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/jni/Application.mk b/java/jni/Application.mk index 608e94c0..6950c0e6 100644 --- a/java/jni/Application.mk +++ b/java/jni/Application.mk @@ -1,5 +1,5 @@ -NDK_TOOLCHAIN_VERSION := clang -APP_STL := c++_static -APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 +# NDK_TOOLCHAIN_VERSION := clang3.5 +APP_STL := gnustl_static +APP_CPPFLAGS := -O3 -fPIC -fPIE -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 APP_PLATFORM := android-14 APP_ABI := all |