diff options
Diffstat (limited to 'services/inputflinger')
-rw-r--r-- | services/inputflinger/Android.mk | 7 | ||||
-rw-r--r-- | 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 2edc07d..add5108 100644 --- a/services/inputflinger/Android.mk +++ b/services/inputflinger/Android.mk @@ -32,16 +32,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 7a77c30..93ce010 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; |