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

Updated integrations

Browse Source
This commit is contained in:
Joseph Henry
2016-06-21 16:54:06 -07:00
parent 2aa4702a93
commit e9603b78f7
3 changed files with 3 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integrations/Android/java/jni/Application.mk
View File

@@ -4,5 +4,5 @@ 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 := armeabi-v7a

2
integrations/README.md
View File

@@ -3,7 +3,7 @@ ZeroTier Integrations
If you want everything built at once, type `make all` and go play outside for a little while, we'll copy all of the targets into the `build` directory for you along with specific instructions on how to use each binary.
*NOTE: For iOS/OSX Frameworks and Bundles to build, you will need XCode command line tools `xcode-select --install`, for Android JNI libraries to build you'll need to install [Android Studio](https://developer.android.com/studio/index.html), if you don't have these things installed we will detect that and just skip those builds automatically.*
*NOTE: For iOS/OSX Frameworks and Bundles to build, you will need XCode command line tools `xcode-select --install`, 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.*
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.