diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-11-03 19:15:00 -0800 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-11-03 19:15:00 -0800 |
| commit | 7756b5bf1c2391235fd7ac8998498a41323eb2cd (patch) | |
| tree | 7b9adb13030c0c6eb0ed5f6be5c7f739921bd190 /java/jni/Android.mk | |
| parent | 172fc1052b736505ceceec0a9253bcfd181c7698 (diff) | |
| parent | eadeac0a42888a6f2fa53e2a802c6c4e43c055b3 (diff) | |
| download | infinitytier-7756b5bf1c2391235fd7ac8998498a41323eb2cd.tar.gz infinitytier-7756b5bf1c2391235fd7ac8998498a41323eb2cd.zip | |
Merge branch 'android-jni-dev' into edge
Diffstat (limited to 'java/jni/Android.mk')
| -rw-r--r-- | java/jni/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 4dd4a57a..3da3b04b 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -4,7 +4,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := ZeroTierOneJNI LOCAL_C_INCLUDES := $(ZT1)/include +LOCAL_C_INCLUDES += $(ZT1)/node LOCAL_LDLIBS := -llog +# LOCAL_CFLAGS := -g # ZeroTierOne SDK source files LOCAL_SRC_FILES := \ @@ -13,7 +15,6 @@ LOCAL_SRC_FILES := \ $(ZT1)/ext/http-parser/http_parser.c \ $(ZT1)/node/C25519.cpp \ $(ZT1)/node/CertificateOfMembership.cpp \ - $(ZT1)/node/Defaults.cpp \ $(ZT1)/node/Dictionary.cpp \ $(ZT1)/node/Identity.cpp \ $(ZT1)/node/IncomingPacket.cpp \ @@ -24,6 +25,7 @@ LOCAL_SRC_FILES := \ $(ZT1)/node/Node.cpp \ $(ZT1)/node/OutboundMulticast.cpp \ $(ZT1)/node/Packet.cpp \ + $(ZT1)/node/Path.cpp \ $(ZT1)/node/Peer.cpp \ $(ZT1)/node/Poly1305.cpp \ $(ZT1)/node/Salsa20.cpp \ @@ -39,6 +41,6 @@ LOCAL_SRC_FILES := \ LOCAL_SRC_FILES += \ com_zerotierone_sdk_Node.cpp \ ZT_jniutils.cpp \ - ZT_jnicache.cpp + ZT_jnilookup.cpp include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file |