diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-05 15:49:07 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-05 15:49:07 -0700 |
| commit | 3790ebe77a90cdaad629f275c2c4294694626733 (patch) | |
| tree | b58f6516b10151c3cb5fcaf899f8cd3e52dc9b03 /java/jni/Android.mk | |
| parent | d7f2287ce960b3a4917699e7c9c98ac26bfb8ca7 (diff) | |
| parent | 9f717e79ea6be730e1cb7cd237c8112d6601c97e (diff) | |
| download | infinitytier-3790ebe77a90cdaad629f275c2c4294694626733.tar.gz infinitytier-3790ebe77a90cdaad629f275c2c4294694626733.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'java/jni/Android.mk')
| -rw-r--r-- | java/jni/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index c563879c..6b5d4a4b 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -11,14 +11,14 @@ LOCAL_LDLIBS := -llog # ZeroTierOne SDK source files LOCAL_SRC_FILES := \ $(ZT1)/ext/lz4/lz4.c \ - $(ZT1)/ext/json-parser/json.c \ $(ZT1)/ext/http-parser/http_parser.c \ $(ZT1)/node/C25519.cpp \ + $(ZT1)/node/Capability.cpp \ $(ZT1)/node/CertificateOfMembership.cpp \ - $(ZT1)/node/DeferredPackets.cpp \ $(ZT1)/node/Identity.cpp \ $(ZT1)/node/IncomingPacket.cpp \ $(ZT1)/node/InetAddress.cpp \ + $(ZT1)/node/Membership.cpp \ $(ZT1)/node/Multicaster.cpp \ $(ZT1)/node/Network.cpp \ $(ZT1)/node/NetworkConfig.cpp \ @@ -32,6 +32,7 @@ LOCAL_SRC_FILES := \ $(ZT1)/node/SelfAwareness.cpp \ $(ZT1)/node/SHA512.cpp \ $(ZT1)/node/Switch.cpp \ + $(ZT1)/node/Tag.cpp \ $(ZT1)/node/Topology.cpp \ $(ZT1)/node/Utils.cpp \ $(ZT1)/osdep/Http.cpp \ |