diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-10-13 15:17:27 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-10-13 15:17:27 -0700 |
| commit | 88e3fe699c685f74d3cc568a50967859fa15db5b (patch) | |
| tree | 3031f98387198c0a8dafa258bf148a6fda16392e /java | |
| parent | 27d997a2e58b7aa65edf8321275984b72e2bb729 (diff) | |
| parent | 8809c6d1221c8e617ad707ab0e4f670d615876ab (diff) | |
| download | infinitytier-88e3fe699c685f74d3cc568a50967859fa15db5b.tar.gz infinitytier-88e3fe699c685f74d3cc568a50967859fa15db5b.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 6b5d4a4b..5e020950 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := ZeroTierOneJNI LOCAL_C_INCLUDES := $(ZT1)/include LOCAL_C_INCLUDES += $(ZT1)/node -LOCAL_LDLIBS := -llog +LOCAL_LDLIBS := -llog -latomic # LOCAL_CFLAGS := -g # ZeroTierOne SDK source files |