diff options
| author | 2023-06-22 01:24:19 +0000 | |
|---|---|---|
| committer | 2023-06-22 01:24:19 +0000 | |
| commit | 0baef9300f8967d77f5ef30552e61bd62adce11c (patch) | |
| tree | 82c59ff819699f9d023d7f2e0d8c55096f8df717 | |
| parent | 8a19cadc33e22e5177141d3de1d61b1e599e06fe (diff) | |
| parent | 6db5aaf680a8c9297d3187586827a4d0f3a94c8e (diff) | |
Merge "Move EventBuilders.h next to MotionEvent definitions" into udc-qpr-dev am: 6db5aaf680
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23696774
Change-Id: I101184b8cec06185942a5d1228ab7b73594097d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | include/input/EventBuilders.h (renamed from services/inputflinger/tests/EventBuilders.h) | 0 | ||||
| -rw-r--r-- | services/inputflinger/tests/InputDeviceMetricsCollector_test.cpp | 3 | ||||
| -rw-r--r-- | services/inputflinger/tests/InputDispatcher_test.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/services/inputflinger/tests/EventBuilders.h b/include/input/EventBuilders.h index 09438e9967..09438e9967 100644 --- a/services/inputflinger/tests/EventBuilders.h +++ b/include/input/EventBuilders.h diff --git a/services/inputflinger/tests/InputDeviceMetricsCollector_test.cpp b/services/inputflinger/tests/InputDeviceMetricsCollector_test.cpp index b401ff6c5d..0aa5e238c3 100644 --- a/services/inputflinger/tests/InputDeviceMetricsCollector_test.cpp +++ b/services/inputflinger/tests/InputDeviceMetricsCollector_test.cpp @@ -18,11 +18,12 @@ #include <gtest/gtest.h> #include <gui/constants.h> +#include <input/EventBuilders.h> #include <linux/input.h> + #include <array> #include <tuple> -#include "EventBuilders.h" #include "TestInputListener.h" namespace android { diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp index 485bf9ada4..48087a4d89 100644 --- a/services/inputflinger/tests/InputDispatcher_test.cpp +++ b/services/inputflinger/tests/InputDispatcher_test.cpp @@ -16,7 +16,6 @@ #include "../dispatcher/InputDispatcher.h" #include "../BlockingQueue.h" -#include "EventBuilders.h" #include <android-base/properties.h> #include <android-base/silent_death_test.h> @@ -26,6 +25,7 @@ #include <fcntl.h> #include <gmock/gmock.h> #include <gtest/gtest.h> +#include <input/EventBuilders.h> #include <input/Input.h> #include <linux/input.h> #include <sys/epoll.h> |