From 2733d61003b621f77771ec34dbf9d30e58ce86ea Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 16 Nov 2017 01:24:42 -0800 Subject: [PATCH] Update libevent to 2.1.8 --- mobile/src/main/jni/Android.mk | 16 ++++------------ mobile/src/main/jni/jni-helper.cpp | 1 + mobile/src/main/jni/libevent | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk index ccc3b473..ee7c03c3 100755 --- a/mobile/src/main/jni/Android.mk +++ b/mobile/src/main/jni/Android.mk @@ -85,21 +85,13 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LIBEVENT_SOURCES := \ - buffer.c \ - bufferevent.c bufferevent_filter.c \ - bufferevent_pair.c bufferevent_ratelim.c \ - bufferevent_sock.c epoll.c \ - epoll_sub.c evdns.c event.c \ - event_tagging.c evmap.c \ - evrpc.c evthread.c \ - evthread_pthread.c evutil.c \ - evutil_rand.c http.c \ - listener.c log.c poll.c \ - select.c signal.c strlcpy.c + buffer.c bufferevent.c event.c \ + bufferevent_sock.c bufferevent_ratelim.c \ + evthread.c log.c evutil.c evutil_time.c evmap.c epoll.c poll.c signal.c select.c LOCAL_MODULE := event LOCAL_SRC_FILES := $(addprefix libevent/, $(LIBEVENT_SOURCES)) -LOCAL_CFLAGS := -O2 -D_EVENT_HAVE_ARC4RANDOM -I$(LOCAL_PATH)/libevent \ +LOCAL_CFLAGS := -O2 -I$(LOCAL_PATH)/libevent \ -I$(LOCAL_PATH)/libevent/include \ include $(BUILD_STATIC_LIBRARY) diff --git a/mobile/src/main/jni/jni-helper.cpp b/mobile/src/main/jni/jni-helper.cpp index 60bac6b1..bf017acd 100644 --- a/mobile/src/main/jni/jni-helper.cpp +++ b/mobile/src/main/jni/jni-helper.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/mobile/src/main/jni/libevent b/mobile/src/main/jni/libevent index 359ca847..f29f07bc 160000 --- a/mobile/src/main/jni/libevent +++ b/mobile/src/main/jni/libevent @@ -1 +1 @@ -Subproject commit 359ca847a649b9c318f9217c0755484d98ecb779 +Subproject commit f29f07bc8c43eec96f227e6f6eede32b3af66168