summaryrefslogtreecommitdiff
path: root/java/jni
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-26 15:02:20 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-26 15:02:20 -0800
commit7c3984413eb62606dd8b2e9abda6f8a77a0770fc (patch)
tree61a0ccee26b316c167bd19c7df088add8f77ab88 /java/jni
parent967ce78a571d3fe1193436c4c77a8ada423ea3c1 (diff)
parent923d3f1fe8f4b61b95043813b79e73e2974a54de (diff)
downloadinfinitytier-7c3984413eb62606dd8b2e9abda6f8a77a0770fc.tar.gz
infinitytier-7c3984413eb62606dd8b2e9abda6f8a77a0770fc.zip
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'java/jni')
-rw-r--r--java/jni/Android.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index e5d501f8..774c2015 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -10,8 +10,6 @@ LOCAL_LDLIBS := -llog -latomic
# ZeroTierOne SDK source files
LOCAL_SRC_FILES := \
- $(ZT1)/ext/lz4/lz4.c \
- $(ZT1)/ext/http-parser/http_parser.c \
$(ZT1)/node/C25519.cpp \
$(ZT1)/node/Capability.cpp \
$(ZT1)/node/CertificateOfMembership.cpp \
@@ -36,8 +34,7 @@ LOCAL_SRC_FILES := \
$(ZT1)/node/Tag.cpp \
$(ZT1)/node/Topology.cpp \
$(ZT1)/node/Utils.cpp
-# $(ZT1)/osdep/Http.cpp \
-# $(ZT1)/osdep/OSUtils.cpp
+
# JNI Files
LOCAL_SRC_FILES += \