ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-06 19:19:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable AES-NI on Android X86-64

Browse Source 
Need to find the magic incantation to enable it on ARM64 still
This commit is contained in:
Grant Limberg 2020-09-21 18:05:25 -07:00
parent 0f2887265c
commit 9e6dba9066
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/jni/Android.mk
View File

@ -12,9 +12,15 @@ LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g # LOCAL_CFLAGS := -g
LOCAL_CFLAGS := -DZT_USE_MINIUPNPC LOCAL_CFLAGS := -DZT_USE_MINIUPNPC
ifeq ($(TARGET_ARCH_ABI),x86_64)
LOCAL_CXXFLAGS := -maes -mpclmul -msse4.1
endif
# ZeroTierOne SDK source files # ZeroTierOne SDK source files
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(ZT1)/node/AES.cpp \
$(ZT1)/node/Bond.cpp \
$(ZT1)/node/BondController.cpp \
$(ZT1)/node/C25519.cpp \ $(ZT1)/node/C25519.cpp \
$(ZT1)/node/Capability.cpp \ $(ZT1)/node/Capability.cpp \
$(ZT1)/node/CertificateOfMembership.cpp \ $(ZT1)/node/CertificateOfMembership.cpp \

4
node/Constants.hpp
View File

@ -111,8 +111,10 @@
#include <mmintrin.h> #include <mmintrin.h>
#endif #endif
#if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON)) #if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
#if defined(__APPLE__) && !defined(__LP64__) #if (defined(__APPLE__) && !defined(__LP64__)) || defined(__ANDROID__)
#ifdef ZT_ARCH_ARM_HAS_NEON #ifdef ZT_ARCH_ARM_HAS_NEON
#undef ZT_ARCH_ARM_HAS_NEON #undef ZT_ARCH_ARM_HAS_NEON
#endif #endif