diff options
| author | Grant Limberg <[email protected]> | 2020-09-22 10:28:31 -0700 |
|---|---|---|
| committer | Grant Limberg <[email protected]> | 2020-09-22 10:28:31 -0700 |
| commit | 7d8cfb1feed400c87e62a1f55ec2d2611cdb470d (patch) | |
| tree | 5827e7993098e04a374925a61e901e7f7edf2b66 /java | |
| parent | 81316807354d8d1a765af2d2598182b4bff7eecc (diff) | |
more magic incantations to make crypto extensions work on Android/ARM64
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/Android.mk | 4 | ||||
| -rw-r--r-- | java/jni/Application.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 065416dd..7aa9f41b 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -11,13 +11,15 @@ LOCAL_C_INCLUDES := \ LOCAL_LDLIBS := -llog # LOCAL_CFLAGS := -g +APP_UNIFIED_HEADERS := true + LOCAL_CFLAGS := -DZT_USE_MINIUPNPC ifeq ($(TARGET_ARCH_ABI),x86_64) LOCAL_CXXFLAGS := -maes -mpclmul -msse4.1 endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) LOCAL_ARM_NEON := true - LOCAL_CXXFLAGS := -mfloat-abi=softfp -mfpu=neon + LOCAL_CXXFLAGS := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes -isystem $NDK/sysroot/usr/include/$TRIPLE endif # ZeroTierOne SDK source files diff --git a/java/jni/Application.mk b/java/jni/Application.mk index 4fc50f73..8613c15e 100644 --- a/java/jni/Application.mk +++ b/java/jni/Application.mk @@ -1,5 +1,5 @@ # NDK_TOOLCHAIN_VERSION := clang3.5 APP_STL := c++_static APP_CPPFLAGS := -Wall -fstack-protector -fexceptions -fno-strict-aliasing -frtti -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 -APP_PLATFORM := android-14 +APP_PLATFORM := android-21 APP_ABI := all |