diff --git a/docs/android_zt_sdk.md b/docs/android_zt_sdk.md index 748f185..e19cd3f 100644 --- a/docs/android_zt_sdk.md +++ b/docs/android_zt_sdk.md @@ -16,7 +16,7 @@ In this example we aim to set up a minimal [Android Studio](https://developer.an **Step 2: Build Shared Library** - `make android_jni_lib` - - The resultant `build/android_jni_lib_YOUR_ARCH/libZeroTierOneJNI.so` is what you want to import into your own project to provide the API to your app. Select your architecture and copy the shared library into `YourProject/src/main/jniLibs/YOUR_ARCH/`. Selecting only the architectures you need will *significantly* reduce overall build time. + - The resultant `build/android_jni_lib_YOUR_ARCH/libZeroTierOneJNI.so` is what you want to import into your own project to provide the API to your app. Select your architecture and copy the shared library into your project's JNI directory, possibly `/src/main/jniLibs/YOUR_ARCH/`. Selecting only the architectures you need will *significantly* reduce overall build time. **Step 3: App Code Modifications** - Create new package called `ZeroTierSDK` in your project and add a new file called `ZeroTierSDK.java` containing: diff --git a/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 6ac21d7..d59d34f 100644 Binary files a/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/integrations/Android/java/README.md b/integrations/android/android_jni_lib/java/README.md similarity index 100% rename from integrations/Android/java/README.md rename to integrations/android/android_jni_lib/java/README.md diff --git a/integrations/Android/java/build.xml b/integrations/android/android_jni_lib/java/build.xml similarity index 100% rename from integrations/Android/java/build.xml rename to integrations/android/android_jni_lib/java/build.xml diff --git a/integrations/Android/java/jni/Android.mk b/integrations/android/android_jni_lib/java/jni/Android.mk similarity index 98% rename from integrations/Android/java/jni/Android.mk rename to integrations/android/android_jni_lib/java/jni/Android.mk index 859cb40..85d3943 100644 --- a/integrations/Android/java/jni/Android.mk +++ b/integrations/android/android_jni_lib/java/jni/Android.mk @@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -ZTSDK := ../../../../src -ZT := ../../../../zerotierone +ZTSDK := ../../../../../src +ZT := ../../../../../zerotierone LOCAL_MODULE := ZeroTierOneJNI LOCAL_C_INCLUDES := $(ZT1)/include diff --git a/integrations/Android/java/jni/Application.mk b/integrations/android/android_jni_lib/java/jni/Application.mk similarity index 64% rename from integrations/Android/java/jni/Application.mk rename to integrations/android/android_jni_lib/java/jni/Application.mk index bcbb2a0..3da5d95 100644 --- a/integrations/Android/java/jni/Application.mk +++ b/integrations/android/android_jni_lib/java/jni/Application.mk @@ -4,5 +4,11 @@ APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SDK -fPIC -fPIE -fvectorize -Wall -fs APP_PLATFORM := android-14 # Architectures -APP_ABI := all -#APP_ABI := armeabi-v7a +# APP_ABI := all +#APP_ABI += arm64-v8a +#APP_ABI += armeabi +APP_ABI += armeabi-v7a +#APP_ABI += mips +#APP_ABI += mips64 +#APP_ABI += x86 +#APP_ABI += x86_64 diff --git a/integrations/Android/java/jni/ZT_jnilookup.cpp b/integrations/android/android_jni_lib/java/jni/ZT_jnilookup.cpp similarity index 100% rename from integrations/Android/java/jni/ZT_jnilookup.cpp rename to integrations/android/android_jni_lib/java/jni/ZT_jnilookup.cpp diff --git a/integrations/Android/java/jni/ZT_jnilookup.h b/integrations/android/android_jni_lib/java/jni/ZT_jnilookup.h similarity index 100% rename from integrations/Android/java/jni/ZT_jnilookup.h rename to integrations/android/android_jni_lib/java/jni/ZT_jnilookup.h diff --git a/integrations/Android/java/jni/ZT_jniutils.cpp b/integrations/android/android_jni_lib/java/jni/ZT_jniutils.cpp similarity index 100% rename from integrations/Android/java/jni/ZT_jniutils.cpp rename to integrations/android/android_jni_lib/java/jni/ZT_jniutils.cpp diff --git a/integrations/Android/java/jni/ZT_jniutils.h b/integrations/android/android_jni_lib/java/jni/ZT_jniutils.h similarity index 100% rename from integrations/Android/java/jni/ZT_jniutils.h rename to integrations/android/android_jni_lib/java/jni/ZT_jniutils.h diff --git a/integrations/Android/java/jni/com_zerotierone_sdk_Node.cpp b/integrations/android/android_jni_lib/java/jni/com_zerotierone_sdk_Node.cpp similarity index 100% rename from integrations/Android/java/jni/com_zerotierone_sdk_Node.cpp rename to integrations/android/android_jni_lib/java/jni/com_zerotierone_sdk_Node.cpp diff --git a/integrations/Android/java/jni/com_zerotierone_sdk_Node.h b/integrations/android/android_jni_lib/java/jni/com_zerotierone_sdk_Node.h similarity index 100% rename from integrations/Android/java/jni/com_zerotierone_sdk_Node.h rename to integrations/android/android_jni_lib/java/jni/com_zerotierone_sdk_Node.h diff --git a/integrations/Android/java/src/com/zerotier/sdk/DataStoreGetListener.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/DataStoreGetListener.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/DataStoreGetListener.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/DataStoreGetListener.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/DataStorePutListener.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/DataStorePutListener.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/DataStorePutListener.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/DataStorePutListener.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/Event.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Event.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/Event.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Event.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/EventListener.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/EventListener.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/EventListener.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/EventListener.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/MulticastGroup.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/MulticastGroup.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/MulticastGroup.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/MulticastGroup.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/NativeUtils.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/NativeUtils.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/NativeUtils.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/NativeUtils.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/Node.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Node.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/Node.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Node.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/NodeException.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/NodeException.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/NodeException.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/NodeException.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/NodeStatus.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/NodeStatus.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/NodeStatus.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/NodeStatus.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/PacketSender.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/PacketSender.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/PacketSender.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/PacketSender.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/Peer.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Peer.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/Peer.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Peer.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/PeerPhysicalPath.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/PeerPhysicalPath.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/PeerPhysicalPath.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/PeerPhysicalPath.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/PeerRole.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/PeerRole.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/PeerRole.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/PeerRole.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/ResultCode.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/ResultCode.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/ResultCode.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/ResultCode.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/Version.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Version.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/Version.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/Version.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkConfig.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkConfig.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkConfig.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkStatus.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkStatus.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkStatus.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkStatus.java diff --git a/integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkType.java b/integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkType.java similarity index 100% rename from integrations/Android/java/src/com/zerotier/sdk/VirtualNetworkType.java rename to integrations/android/android_jni_lib/java/src/com/zerotier/sdk/VirtualNetworkType.java diff --git a/integrations/Android/proj/README.md b/integrations/android/android_jni_lib/proj/README.md similarity index 100% rename from integrations/Android/proj/README.md rename to integrations/android/android_jni_lib/proj/README.md diff --git a/integrations/Android/proj/app/app.iml b/integrations/android/android_jni_lib/proj/app/app.iml similarity index 100% rename from integrations/Android/proj/app/app.iml rename to integrations/android/android_jni_lib/proj/app/app.iml diff --git a/integrations/Android/proj/app/build.gradle b/integrations/android/android_jni_lib/proj/app/build.gradle similarity index 96% rename from integrations/Android/proj/app/build.gradle rename to integrations/android/android_jni_lib/proj/app/build.gradle index 5f63419..fb6eac1 100644 --- a/integrations/Android/proj/app/build.gradle +++ b/integrations/android/android_jni_lib/proj/app/build.gradle @@ -31,7 +31,7 @@ android { if (Os.isFamily(Os.FAMILY_WINDOWS)) { commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build.cmd", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../../../zerotierone" } else { - commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../../zerotierone" + commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../../../zerotierone" } } tasks.withType(JavaCompile) { diff --git a/integrations/Android/proj/app/google-services.json b/integrations/android/android_jni_lib/proj/app/google-services.json similarity index 100% rename from integrations/Android/proj/app/google-services.json rename to integrations/android/android_jni_lib/proj/app/google-services.json diff --git a/integrations/Android/proj/app/proguard-rules.pro b/integrations/android/android_jni_lib/proj/app/proguard-rules.pro similarity index 100% rename from integrations/Android/proj/app/proguard-rules.pro rename to integrations/android/android_jni_lib/proj/app/proguard-rules.pro diff --git a/integrations/Android/proj/app/src/androidTest/java/com/zerotier/one/ApplicationTest.java b/integrations/android/android_jni_lib/proj/app/src/androidTest/java/com/zerotier/one/ApplicationTest.java similarity index 100% rename from integrations/Android/proj/app/src/androidTest/java/com/zerotier/one/ApplicationTest.java rename to integrations/android/android_jni_lib/proj/app/src/androidTest/java/com/zerotier/one/ApplicationTest.java diff --git a/integrations/Android/proj/app/src/main/AndroidManifest.xml b/integrations/android/android_jni_lib/proj/app/src/main/AndroidManifest.xml similarity index 100% rename from integrations/Android/proj/app/src/main/AndroidManifest.xml rename to integrations/android/android_jni_lib/proj/app/src/main/AndroidManifest.xml diff --git a/integrations/Android/proj/app/src/main/ic_launcher-web.png b/integrations/android/android_jni_lib/proj/app/src/main/ic_launcher-web.png similarity index 100% rename from integrations/Android/proj/app/src/main/ic_launcher-web.png rename to integrations/android/android_jni_lib/proj/app/src/main/ic_launcher-web.png diff --git a/integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java b/integrations/android/android_jni_lib/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/AnalyticsApplication.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/AnalyticsApplication.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/AnalyticsApplication.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/AnalyticsApplication.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/AnalyticsTrackers.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/AnalyticsTrackers.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/AnalyticsTrackers.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/AnalyticsTrackers.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/ErrorEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/ErrorEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/ErrorEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/ErrorEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/JoinNetworkEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/JoinNetworkEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/JoinNetworkEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/JoinNetworkEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/LeaveNetworkEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/LeaveNetworkEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/LeaveNetworkEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/LeaveNetworkEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/ManualDisconnectEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/ManualDisconnectEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/ManualDisconnectEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/ManualDisconnectEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkInfoReplyEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkInfoReplyEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkInfoReplyEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkInfoReplyEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkListReplyEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkListReplyEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkListReplyEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkListReplyEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkReconfigureEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkReconfigureEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkReconfigureEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkReconfigureEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkRemovedEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkRemovedEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NetworkRemovedEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NetworkRemovedEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NodeDestroyedEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NodeDestroyedEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NodeDestroyedEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NodeDestroyedEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NodeIDEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NodeIDEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NodeIDEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NodeIDEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NodeStatusEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NodeStatusEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/NodeStatusEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/NodeStatusEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkInfoEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkInfoEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkInfoEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkInfoEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkListEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkListEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkListEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/RequestNetworkListEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/RequestNodeStatusEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/RequestNodeStatusEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/RequestNodeStatusEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/RequestNodeStatusEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/events/StopEvent.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/StopEvent.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/events/StopEvent.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/events/StopEvent.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ARPTable.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/ARPTable.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ARPTable.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/ARPTable.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/DataStore.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/DataStore.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/DataStore.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/DataStore.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/NetworkStateReceiver.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/NetworkStateReceiver.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/NetworkStateReceiver.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/NetworkStateReceiver.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/Route.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/Route.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/Route.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/Route.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/RuntimeService.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/RuntimeService.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/RuntimeService.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/RuntimeService.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/StartupReceiver.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/StartupReceiver.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/StartupReceiver.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/StartupReceiver.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/TunTapAdapter.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/TunTapAdapter.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/TunTapAdapter.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/TunTapAdapter.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/UdpCom.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/UdpCom.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/UdpCom.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/UdpCom.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/HexKeyboard.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/HexKeyboard.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/HexKeyboard.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/HexKeyboard.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkActivity.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkActivity.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkActivity.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkActivity.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkFragment.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkFragment.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkFragment.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/JoinNetworkFragment.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/NetworkListActivity.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/NetworkListActivity.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/NetworkListActivity.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/NetworkListActivity.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/NetworkListFragment.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/NetworkListFragment.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/NetworkListFragment.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/NetworkListFragment.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/PrefsActivity.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/PrefsActivity.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/PrefsActivity.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/PrefsActivity.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/PrefsFragment.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/PrefsFragment.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/PrefsFragment.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/PrefsFragment.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/SingleFragmentActivity.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/SingleFragmentActivity.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/ui/SingleFragmentActivity.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/ui/SingleFragmentActivity.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/util/IPPacketUtils.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/util/IPPacketUtils.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/util/IPPacketUtils.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/util/IPPacketUtils.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/util/InetAddressUtils.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/util/InetAddressUtils.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/util/InetAddressUtils.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/util/InetAddressUtils.java diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/util/NetworkIdUtils.java b/integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/util/NetworkIdUtils.java similarity index 100% rename from integrations/Android/proj/app/src/main/java/com/zerotier/one/util/NetworkIdUtils.java rename to integrations/android/android_jni_lib/proj/app/src/main/java/com/zerotier/one/util/NetworkIdUtils.java diff --git a/integrations/Android/proj/app/src/main/res/drawable/button_style.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/button_style.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/button_style.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/button_style.xml diff --git a/integrations/Android/proj/app/src/main/res/drawable/hex.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/hex.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/hex.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/hex.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/ic_launcher.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/ic_launcher.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/ic_launcher.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/ic_launcher.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_allleft.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_allleft.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_allleft.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_allleft.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_allright.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_allright.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_allright.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_allright.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_delete.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_delete.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_delete.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_delete.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_done.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_done.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_done.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_done.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_left.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_left.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_left.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_left.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_return.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_return.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_return.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_return.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_right.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_right.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/sym_keyboard_right.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/sym_keyboard_right.png diff --git a/integrations/Android/proj/app/src/main/res/drawable/txt.png b/integrations/android/android_jni_lib/proj/app/src/main/res/drawable/txt.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/drawable/txt.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/drawable/txt.png diff --git a/integrations/Android/proj/app/src/main/res/layout/activity_fragment.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/layout/activity_fragment.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/layout/activity_fragment.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/layout/activity_fragment.xml diff --git a/integrations/Android/proj/app/src/main/res/layout/fragment_join_network.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/layout/fragment_join_network.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/layout/fragment_join_network.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/layout/fragment_join_network.xml diff --git a/integrations/Android/proj/app/src/main/res/layout/list_item_network.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/layout/list_item_network.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/layout/list_item_network.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/layout/list_item_network.xml diff --git a/integrations/Android/proj/app/src/main/res/layout/list_item_recent_network.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/layout/list_item_recent_network.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/layout/list_item_recent_network.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/layout/list_item_recent_network.xml diff --git a/integrations/Android/proj/app/src/main/res/layout/network_list_fragment.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/layout/network_list_fragment.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/layout/network_list_fragment.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/layout/network_list_fragment.xml diff --git a/integrations/Android/proj/app/src/main/res/menu/menu_network_list.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/menu/menu_network_list.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/menu/menu_network_list.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/menu/menu_network_list.xml diff --git a/integrations/Android/proj/app/src/main/res/mipmap-hdpi/ic_launcher.png b/integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/integrations/Android/proj/app/src/main/res/mipmap-mdpi/ic_launcher.png b/integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/integrations/Android/proj/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/integrations/Android/proj/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/integrations/Android/proj/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from integrations/Android/proj/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to integrations/android/android_jni_lib/proj/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/integrations/Android/proj/app/src/main/res/values-w820dp/dimens.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/values-w820dp/dimens.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/values-w820dp/dimens.xml diff --git a/integrations/Android/proj/app/src/main/res/values/dimens.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/values/dimens.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/values/dimens.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/values/dimens.xml diff --git a/integrations/Android/proj/app/src/main/res/values/strings.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/values/strings.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/values/strings.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/values/strings.xml diff --git a/integrations/Android/proj/app/src/main/res/values/styles.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/values/styles.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/values/styles.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/values/styles.xml diff --git a/integrations/Android/proj/app/src/main/res/xml/app_tracker.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/xml/app_tracker.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/xml/app_tracker.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/xml/app_tracker.xml diff --git a/integrations/Android/proj/app/src/main/res/xml/hex_keyboard.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/xml/hex_keyboard.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/xml/hex_keyboard.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/xml/hex_keyboard.xml diff --git a/integrations/Android/proj/app/src/main/res/xml/preferences.xml b/integrations/android/android_jni_lib/proj/app/src/main/res/xml/preferences.xml similarity index 100% rename from integrations/Android/proj/app/src/main/res/xml/preferences.xml rename to integrations/android/android_jni_lib/proj/app/src/main/res/xml/preferences.xml diff --git a/integrations/Android/proj/build.gradle b/integrations/android/android_jni_lib/proj/build.gradle similarity index 100% rename from integrations/Android/proj/build.gradle rename to integrations/android/android_jni_lib/proj/build.gradle diff --git a/integrations/Android/proj/gradle.properties b/integrations/android/android_jni_lib/proj/gradle.properties similarity index 100% rename from integrations/Android/proj/gradle.properties rename to integrations/android/android_jni_lib/proj/gradle.properties diff --git a/integrations/Android/proj/gradle/wrapper/gradle-wrapper.jar b/integrations/android/android_jni_lib/proj/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from integrations/Android/proj/gradle/wrapper/gradle-wrapper.jar rename to integrations/android/android_jni_lib/proj/gradle/wrapper/gradle-wrapper.jar diff --git a/integrations/Android/proj/gradle/wrapper/gradle-wrapper.properties b/integrations/android/android_jni_lib/proj/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from integrations/Android/proj/gradle/wrapper/gradle-wrapper.properties rename to integrations/android/android_jni_lib/proj/gradle/wrapper/gradle-wrapper.properties diff --git a/integrations/Android/proj/gradlew b/integrations/android/android_jni_lib/proj/gradlew similarity index 100% rename from integrations/Android/proj/gradlew rename to integrations/android/android_jni_lib/proj/gradlew diff --git a/integrations/Android/proj/gradlew.bat b/integrations/android/android_jni_lib/proj/gradlew.bat similarity index 100% rename from integrations/Android/proj/gradlew.bat rename to integrations/android/android_jni_lib/proj/gradlew.bat diff --git a/integrations/Android/proj/local.properties b/integrations/android/android_jni_lib/proj/local.properties similarity index 100% rename from integrations/Android/proj/local.properties rename to integrations/android/android_jni_lib/proj/local.properties diff --git a/integrations/Android/proj/proj.iml b/integrations/android/android_jni_lib/proj/proj.iml similarity index 100% rename from integrations/Android/proj/proj.iml rename to integrations/android/android_jni_lib/proj/proj.iml diff --git a/integrations/Android/proj/settings.gradle b/integrations/android/android_jni_lib/proj/settings.gradle similarity index 100% rename from integrations/Android/proj/settings.gradle rename to integrations/android/android_jni_lib/proj/settings.gradle diff --git a/integrations/Android/proj/zerotierandroid.iml b/integrations/android/android_jni_lib/proj/zerotierandroid.iml similarity index 100% rename from integrations/Android/proj/zerotierandroid.iml rename to integrations/android/android_jni_lib/proj/zerotierandroid.iml diff --git a/integrations/android/example_app/.gitignore b/integrations/android/example_app/.gitignore new file mode 100644 index 0000000..c6cbe56 --- /dev/null +++ b/integrations/android/example_app/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/integrations/android/example_app/app/.gitignore b/integrations/android/example_app/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/integrations/android/example_app/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/integrations/android/example_app/app/build.gradle b/integrations/android/example_app/app/build.gradle new file mode 100644 index 0000000..ec81786 --- /dev/null +++ b/integrations/android/example_app/app/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + defaultConfig { + applicationId "com.example.joseph.example_android_app" + minSdkVersion 15 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha1' + testCompile 'junit:junit:4.12' + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' + androidTestCompile 'com.android.support.test:runner:0.5' + androidTestCompile 'com.android.support:support-annotations:23.4.0' +} diff --git a/integrations/android/example_app/app/proguard-rules.pro b/integrations/android/example_app/app/proguard-rules.pro new file mode 100644 index 0000000..171ee89 --- /dev/null +++ b/integrations/android/example_app/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/Joseph/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/integrations/android/example_app/app/src/androidTest/java/com/example/joseph/example_android_app/ExampleInstrumentationTest.java b/integrations/android/example_app/app/src/androidTest/java/com/example/joseph/example_android_app/ExampleInstrumentationTest.java new file mode 100644 index 0000000..449fb8e --- /dev/null +++ b/integrations/android/example_app/app/src/androidTest/java/com/example/joseph/example_android_app/ExampleInstrumentationTest.java @@ -0,0 +1,29 @@ +package com.example.joseph.example_android_app; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.filters.MediumTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@MediumTest +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentationTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.example.joseph.example_android_app", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/integrations/android/example_app/app/src/main/AndroidManifest.xml b/integrations/android/example_app/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..48d32c8 --- /dev/null +++ b/integrations/android/example_app/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/integrations/android/example_app/app/src/main/java/ZeroTierSDK/ZeroTierSDK/ZeroTierSDK.java b/integrations/android/example_app/app/src/main/java/ZeroTierSDK/ZeroTierSDK/ZeroTierSDK.java new file mode 100644 index 0000000..8d416f9 --- /dev/null +++ b/integrations/android/example_app/app/src/main/java/ZeroTierSDK/ZeroTierSDK/ZeroTierSDK.java @@ -0,0 +1,5 @@ +package ZeroTierSDK.ZeroTierSDK; +public class ZeroTierSDK { + public native void startOneService(); + static { System.loadLibrary("ZeroTierOneJNI"); } // Loads JNI code +} \ No newline at end of file diff --git a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_android_app/MainActivity.java b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_android_app/MainActivity.java new file mode 100644 index 0000000..2099e6c --- /dev/null +++ b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_android_app/MainActivity.java @@ -0,0 +1,21 @@ +package com.example.joseph.example_android_app; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + new Thread(new Runnable() { + public void run() { + ZeroTierSDK wrapper = new ZeroTierSDK(); + wrapper.startOneService(); // Calls to JNI code + } + }).start(); + + } +} diff --git a/integrations/android/example_app/app/src/main/res/layout/activity_main.xml b/integrations/android/example_app/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..754c23e --- /dev/null +++ b/integrations/android/example_app/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/integrations/android/example_app/app/src/main/res/mipmap-hdpi/ic_launcher.png b/integrations/android/example_app/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/integrations/android/example_app/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/integrations/android/example_app/app/src/main/res/mipmap-mdpi/ic_launcher.png b/integrations/android/example_app/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/integrations/android/example_app/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/integrations/android/example_app/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/integrations/android/example_app/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/integrations/android/example_app/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/integrations/android/example_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/integrations/android/example_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/integrations/android/example_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/integrations/android/example_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/integrations/android/example_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/integrations/android/example_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/integrations/android/example_app/app/src/main/res/values-w820dp/dimens.xml b/integrations/android/example_app/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/integrations/android/example_app/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/integrations/android/example_app/app/src/main/res/values/colors.xml b/integrations/android/example_app/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/integrations/android/example_app/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/integrations/android/example_app/app/src/main/res/values/dimens.xml b/integrations/android/example_app/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/integrations/android/example_app/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/integrations/android/example_app/app/src/main/res/values/strings.xml b/integrations/android/example_app/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..d0454e9 --- /dev/null +++ b/integrations/android/example_app/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Example_Android_App + diff --git a/integrations/android/example_app/app/src/main/res/values/styles.xml b/integrations/android/example_app/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/integrations/android/example_app/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/integrations/android/example_app/app/src/test/java/com/example/joseph/example_android_app/ExampleUnitTest.java b/integrations/android/example_app/app/src/test/java/com/example/joseph/example_android_app/ExampleUnitTest.java new file mode 100644 index 0000000..4448952 --- /dev/null +++ b/integrations/android/example_app/app/src/test/java/com/example/joseph/example_android_app/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.example.joseph.example_android_app; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/integrations/android/example_app/build.gradle b/integrations/android/example_app/build.gradle new file mode 100644 index 0000000..12df91c --- /dev/null +++ b/integrations/android/example_app/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.0-alpha1' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/integrations/android/example_app/gradle.properties b/integrations/android/example_app/gradle.properties new file mode 100644 index 0000000..5eb079f --- /dev/null +++ b/integrations/android/example_app/gradle.properties @@ -0,0 +1,20 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +org.gradle.daemon=true +org.gradle.parallel=true + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/integrations/android/example_app/gradle/wrapper/gradle-wrapper.jar b/integrations/android/example_app/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/integrations/android/example_app/gradle/wrapper/gradle-wrapper.jar differ diff --git a/integrations/android/example_app/gradle/wrapper/gradle-wrapper.properties b/integrations/android/example_app/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..122a0dc --- /dev/null +++ b/integrations/android/example_app/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/integrations/android/example_app/gradlew b/integrations/android/example_app/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/integrations/android/example_app/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/integrations/android/example_app/gradlew.bat b/integrations/android/example_app/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/integrations/android/example_app/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/integrations/android/example_app/settings.gradle b/integrations/android/example_app/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/integrations/android/example_app/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/project.pbxproj b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.pbxproj similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/project.pbxproj rename to integrations/apple/example_app/Example_OSX_App.xcodeproj/project.pbxproj diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate rename to integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme b/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme rename to integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist b/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist rename to integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App/AppDelegate.swift b/integrations/apple/example_app/Example_OSX_App/AppDelegate.swift similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App/AppDelegate.swift rename to integrations/apple/example_app/Example_OSX_App/AppDelegate.swift diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json b/integrations/apple/example_app/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json rename to integrations/apple/example_app/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App/Base.lproj/Main.storyboard b/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App/Base.lproj/Main.storyboard rename to integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App/Info.plist b/integrations/apple/example_app/Example_OSX_App/Info.plist similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App/Info.plist rename to integrations/apple/example_app/Example_OSX_App/Info.plist diff --git a/integrations/Apple/Example_OSX_App/Example_OSX_App/ViewController.swift b/integrations/apple/example_app/Example_OSX_App/ViewController.swift similarity index 100% rename from integrations/Apple/Example_OSX_App/Example_OSX_App/ViewController.swift rename to integrations/apple/example_app/Example_OSX_App/ViewController.swift diff --git a/make-mac.mk b/make-mac.mk index b3ffcf3..11eeb17 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -71,9 +71,9 @@ ios_unity3d_bundle: # Build library for Android Unity integrations # Build JNI library for Android app integration android_jni_lib: - cd integrations/android/proj; ./gradlew assembleDebug -# cd integrations/android/java/libs/; for f in *; do mv "$f" "android_jni_lib_$f"; done - mv integrations/android/java/libs/* build + cd integrations/android/android_jni_lib/proj; ./gradlew assembleDebug +# cd integrations/android/android_jni_lib/java/libs/; for f in *; do mv "$f" "android_jni_lib_$f"; done + mv integrations/android/android_jni_lib/java/libs/* build cp docs/android_zt_sdk.md build/README.md osx_shared_lib: $(OBJS) @@ -97,9 +97,15 @@ clean: find . -type f -name '*.o' -delete find . -type f -name '*.so' -delete find . -type f -name '*.o.d' -delete - # Remove junk generated by Android builds - cd integrations/Android/proj; ./gradlew clean - rm -rf integrations/Android/proj/.gradle - rm -rf integrations/Android/proj/.idea - rm -rf integrations/Android/proj/build + + # android JNI lib project + cd integrations/android/android_jni_lib/proj; ./gradlew clean + rm -rf integrations/android/android_jni_lib/proj/.gradle + rm -rf integrations/android/android_jni_lib/proj/.idea + rm -rf integrations/android/android_jni_lib/proj/build + + # example android app project + cd integrations/android/example_app; ./gradlew clean + rm -rf integrations/android/example_app/.idea + rm -rf integrations/android/example_app/.gradle FORCE: diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp index 87b82ab..00de4be 100644 --- a/src/SDK_ServiceSetup.cpp +++ b/src/SDK_ServiceSetup.cpp @@ -129,7 +129,7 @@ extern "C" { * Starts a new service instance */ #if defined(__ANDROID__) - JNIEXPORT void JNICALL Java_SDK_SDK_Wrapper_startOneService(JNIEnv *env, jobject thisObj) + JNIEXPORT void JNICALL Java_ZeroTierSDK_startOneService(JNIEnv *env, jobject thisObj) //JNIEXPORT void JNICALL Java_Netcon_NetconWrapper_startOneService(JNIEnv *env, jobject thisObj) { #else diff --git a/src/SDK_ServiceSetup.hpp b/src/SDK_ServiceSetup.hpp index 940c3de..c144992 100644 --- a/src/SDK_ServiceSetup.hpp +++ b/src/SDK_ServiceSetup.hpp @@ -40,7 +40,7 @@ extern "C" { #define INTERCEPT_DISABLED 222 #if defined(__ANDROID__) - JNIEXPORT void JNICALL Java_SDK_SDK_Wrapper_startOneService(JNIEnv *env, jobject thisObj); + JNIEXPORT void JNICALL Java_ZeroTierSDK_startOneService(JNIEnv *env, jobject thisObj); #else void *startOneService(void *thread_id); void init_service(int key, const char * path);