summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2017-03-09 17:48:40 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2017-03-09 17:48:40 -0800
commit1520534660698698d9db064e1d9f7b3f0ae9913c (patch)
tree0345ba90adf39541cad98c59b2cf93d93ba14693 /java
parent6d6719da27ea966fed564bc23e57c75669758151 (diff)
downloadinfinitytier-1520534660698698d9db064e1d9f7b3f0ae9913c.tar.gz
infinitytier-1520534660698698d9db064e1d9f7b3f0ae9913c.zip
fix some rediculousness in NDK-14
Apparently having -fPIC on the command line multiple times turns it back off
Diffstat (limited to 'java')
-rw-r--r--java/jni/Application.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 6950c0e6..19891cc8 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,5 +1,5 @@
# 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_STL := c++_static
+APP_CPPFLAGS := -O3 -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_PLATFORM := android-14
APP_ABI := all