gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated android docs

Browse Source
This commit is contained in:
Joseph Henry
2016-07-18 12:50:51 -07:00
parent 8114b269c9
commit 30b3f9d9a5
3 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/README.md
View File

@@ -5,7 +5,7 @@ If you want everything built at once, type `make all` and go play outside for a
*NOTE for Apple platforms: In order to build iOS/OSX Frameworks and Bundles you will need XCode command line tools `xcode-select --install`* *NOTE for Apple platforms: In order to build iOS/OSX Frameworks and Bundles you will need XCode command line tools `xcode-select --install`*
*NOTE: For Android JNI libraries to build you'll need to install [Android Studio](https://developer.android.com/studio/index.html) and the [Android NDK](https://developer.android.com/ndk/index.html), and you'll need to tell our project where you put it by putting the path in [this file](Android/proj/local.properties), if you don't have these things installed and configured we will detect that and just skip those builds automatically. Additionally, you can specify the target architectures you want to build in [Application.mk](android/java/jni/Application.mk). By default it will build `arm64-v8a`, `armeabi`, `armeabi-v7a`, `mips`, `mips64`, `x86`, and `x86_64`* *NOTE: For Android JNI libraries to build you'll need to install [Android Studio](https://developer.android.com/studio/index.html) the [Android NDK](https://developer.android.com/ndk/index.html). Currently only Android NDK r10e is supported and can be found [here for OSX](http://dl.google.com/android/repository/android-ndk-r10e-darwin-x86_64.zip) and [here for Linux](http://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip). You'll need to tell our project where you put it by putting the path in [this file](Android/proj/local.properties), you'll need to install the Android Build-Tools (this can typically be done through the editor the first time you start it up), and finally you should probably upgrade your Gradle plugin if it asks you to. If you don't have these things installed and configured we will detect that and just skip those builds automatically. Additionally, you can specify the target architectures you wish to build for by editing [Application.mk](ZeroTierSDK/integrations/android/android_jni_lib/java/jni/Application.mk). By default it will build `arm64-v8a`, `armeabi`, `armeabi-v7a`, `mips`, `mips64`, `x86`, and `x86_64`*
Below are the specific instructions for each integration requiring *little to no modification to your code*. Remember, with a full build we'll put a copy of the appropriate integration instructions in the resultant binary's folder for you anyway. Below are the specific instructions for each integration requiring *little to no modification to your code*. Remember, with a full build we'll put a copy of the appropriate integration instructions in the resultant binary's folder for you anyway.

17
integrations/android/android_jni_lib/java/README.md
View File

@@ -1,17 +0,0 @@
ZeroTier One SDK - Android JNI Wrapper
=====
Building
-----
Reqires:
* JDK
* ANT
* Android NDK
Required Environment Variables:
* 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)

16
integrations/android/android_jni_lib/proj/README.md
View File

@@ -1,16 +0,0 @@
ZeroTier One for Android
=====
Fully integrated build of ZeroTier JNI + the Android application.
To Build
------
1. Open project in Android Studio (Eclipse is not supported)
2. Open the file local.properties
3. Add the following line:
`ndk.dir=/path/to/your/local/ndk`
Once that is done, it should be buildable, runnable, debuggable, etc.