From 5ea47f7a3222357c4b16500ad66ce493d017ebb2 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 9 Jan 2015 15:56:15 -0800 Subject: [PATCH] We have POSIX clocks, and we don't need to ask for the openssl headers. This code doesn't need to run on the Mac, and the BoringSSL transition will be easier without references to external/openssl. Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0 --- services/inputflinger/Android.mk | 7 ++----- services/inputflinger/EventHub.cpp | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/services/inputflinger/Android.mk b/services/inputflinger/Android.mk index 85edbe5db..1af59a3f8 100644 --- a/services/inputflinger/Android.mk +++ b/services/inputflinger/Android.mk @@ -31,16 +31,13 @@ LOCAL_SHARED_LIBRARIES := \ libinput \ liblog \ libutils \ - libui \ - libhardware_legacy + libui \ + libhardware_legacy # TODO: Move inputflinger to its own process and mark it hidden #LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_C_INCLUDES := \ - external/openssl/include \ - LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp index 7a77c305c..93ce0103d 100644 --- a/services/inputflinger/EventHub.cpp +++ b/services/inputflinger/EventHub.cpp @@ -858,7 +858,6 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz int(iev.time.tv_sec), int(iev.time.tv_usec)); } -#ifdef HAVE_POSIX_CLOCKS // Use the time specified in the event instead of the current time // so that downstream code can get more accurate estimates of // event dispatch latency from the time the event is enqueued onto @@ -909,9 +908,6 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz event->when, time, now); } } -#else - event->when = now; -#endif event->deviceId = deviceId; event->type = iev.type; event->code = iev.code;