Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23958e14 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers." 

* commit 'a7dcab69':
  We have POSIX clocks, and we don't need to ask for the openssl headers.
parents ee7ed020 a7dcab69

services/inputflinger/Android.mk

+2 −5
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ 
# 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)

services/inputflinger/EventHub.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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;