diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-01-13 12:13:20 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-01-13 12:13:20 -0800 |
| commit | f8e18f209884d8738ff46b2df3f8410a79310477 (patch) | |
| tree | d2590b77be4af107fb4536bba25ed3af0d702d38 /java/jni/Android.mk | |
| parent | f81c67c0f0f0d1dae38fffd053bbbca90aabc2b2 (diff) | |
| parent | 4f4dd3446c836b380b54140922633e4f17822eba (diff) | |
| download | infinitytier-f8e18f209884d8738ff46b2df3f8410a79310477.tar.gz infinitytier-f8e18f209884d8738ff46b2df3f8410a79310477.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 73eb2c46..e5d501f8 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -35,9 +35,9 @@ LOCAL_SRC_FILES := \ $(ZT1)/node/Switch.cpp \ $(ZT1)/node/Tag.cpp \ $(ZT1)/node/Topology.cpp \ - $(ZT1)/node/Utils.cpp \ - $(ZT1)/osdep/Http.cpp \ - $(ZT1)/osdep/OSUtils.cpp + $(ZT1)/node/Utils.cpp +# $(ZT1)/osdep/Http.cpp \ +# $(ZT1)/osdep/OSUtils.cpp # JNI Files LOCAL_SRC_FILES += \ |