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

Commit 6db5aaf6 authored by Cody Heiner's avatar Cody Heiner Committed by Android (Google) Code Review
Browse files

Merge "Move EventBuilders.h next to MotionEvent definitions" into udc-qpr-dev

parents 042a7a0b 1feacf46
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -18,11 +18,12 @@


#include <gtest/gtest.h>
#include <gtest/gtest.h>
#include <gui/constants.h>
#include <gui/constants.h>
#include <input/EventBuilders.h>
#include <linux/input.h>
#include <linux/input.h>

#include <array>
#include <array>
#include <tuple>
#include <tuple>


#include "EventBuilders.h"
#include "TestInputListener.h"
#include "TestInputListener.h"


namespace android {
namespace android {
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@


#include "../dispatcher/InputDispatcher.h"
#include "../dispatcher/InputDispatcher.h"
#include "../BlockingQueue.h"
#include "../BlockingQueue.h"
#include "EventBuilders.h"


#include <android-base/properties.h>
#include <android-base/properties.h>
#include <android-base/silent_death_test.h>
#include <android-base/silent_death_test.h>
@@ -26,6 +25,7 @@
#include <fcntl.h>
#include <fcntl.h>
#include <gmock/gmock.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <gtest/gtest.h>
#include <input/EventBuilders.h>
#include <input/Input.h>
#include <input/Input.h>
#include <linux/input.h>
#include <linux/input.h>
#include <sys/epoll.h>
#include <sys/epoll.h>