github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-23 22:55:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix make process for ZeroTier Android SDK

Browse source
This commit is contained in:
Caerostris 2015-12-09 18:33:55 +00:00
commit b34cc94bb7
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
java/CMakeLists.txt
View file

@ -10,7 +10,7 @@ set(Java_INCLUDE_DIRS $ENV{JAVA_HOME}/include)
endif() endif()
if(APPLE) if(APPLE)
set(Java_INCLUDE_DIRS "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/JavaVM.framework/Headers") set(Java_INCLUDE_DIRS "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/JavaVM.framework/Headers")
endif() endif()
message("Java Include Dirs: ${Java_INCLUDE_DIRS}") message("Java Include Dirs: ${Java_INCLUDE_DIRS}")
@ -31,7 +31,7 @@ set(src_files
../ext/http-parser/http_parser.c ../ext/http-parser/http_parser.c
../node/C25519.cpp ../node/C25519.cpp
../node/CertificateOfMembership.cpp ../node/CertificateOfMembership.cpp
../node/Defaults.cpp ../node/DeferredPackets.cpp
../node/Dictionary.cpp ../node/Dictionary.cpp
../node/Identity.cpp ../node/Identity.cpp
../node/IncomingPacket.cpp ../node/IncomingPacket.cpp
@ -42,6 +42,7 @@ set(src_files
../node/Node.cpp ../node/Node.cpp
../node/OutboundMulticast.cpp ../node/OutboundMulticast.cpp
../node/Packet.cpp ../node/Packet.cpp
../node/Path.cpp
../node/Peer.cpp ../node/Peer.cpp
../node/Poly1305.cpp ../node/Poly1305.cpp
../node/Salsa20.cpp ../node/Salsa20.cpp
@ -54,7 +55,7 @@ set(src_files
../osdep/OSUtils.cpp ../osdep/OSUtils.cpp
jni/com_zerotierone_sdk_Node.cpp jni/com_zerotierone_sdk_Node.cpp
jni/ZT_jniutils.cpp jni/ZT_jniutils.cpp
jni/ZT_jnicache.cpp jni/ZT_jnilookup.cpp
) )
set(include_dirs set(include_dirs
@ -88,4 +89,4 @@ if(WIN32)
) )
endif() endif()
target_link_libraries(${PROJECT_NAME} ${link_libs}) target_link_libraries(${PROJECT_NAME} ${link_libs})

6
java/README.md
View file

@ -9,9 +9,15 @@ Reqires:
* JDK * JDK
* ANT * ANT
* Android SDK
* Android NDK * Android NDK
* XCode (if building on OS X)
Required Environment Variables: Required Environment Variables:
* JAVA_HOME - Path to the Java SDK's home folder
* NDK\_BUILD\_LOC - Path do the ndk-build script in the Android NDK * NDK\_BUILD\_LOC - Path do the ndk-build script in the Android NDK
* ANDROID\_PLATFORM - path to the directory android.jar lives (on Windows: C:\Users\<username>\AppData\Local\Android\sdk\platforms\android-21) * ANDROID\_PLATFORM - path to the directory android.jar lives (on Windows: C:\Users\<username>\AppData\Local\Android\sdk\platforms\android-21)
* ZT - Path to ZeroTier's source folder
Make sure to check your OS version in CMakeLists.txt if your are on OS X.

2
java/jni/Android.mk
View file

@ -44,4 +44,4 @@ LOCAL_SRC_FILES += \
ZT_jniutils.cpp \ ZT_jniutils.cpp \
ZT_jnilookup.cpp ZT_jnilookup.cpp
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)