diff options
| author | Adam Ierymenko <[email protected]> | 2020-10-08 18:08:24 -0400 |
|---|---|---|
| committer | Adam Ierymenko <[email protected]> | 2020-10-08 18:08:24 -0400 |
| commit | 24769219b5c121943190e69d086f7fadfcfba86d (patch) | |
| tree | 970b4a1b3cdfb2e3e7588005a3e5ad508055f6ce /java | |
| parent | da6fe18e174793fddcec549f726f05563c8949e2 (diff) | |
| parent | a973a6e10ef9d978491733e56723b4a8e078959f (diff) | |
Merge branch 'dev'
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/Android.mk | 12 | ||||
| -rw-r--r-- | java/jni/Application.mk | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index f018950d..7aa9f41b 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -11,10 +11,22 @@ 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 := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes -isystem $NDK/sysroot/usr/include/$TRIPLE +endif # ZeroTierOne SDK source files LOCAL_SRC_FILES := \ + $(ZT1)/node/AES.cpp \ + $(ZT1)/node/Bond.cpp \ + $(ZT1)/node/BondController.cpp \ $(ZT1)/node/C25519.cpp \ $(ZT1)/node/Capability.cpp \ $(ZT1)/node/CertificateOfMembership.cpp \ 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 |