summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-10-26 22:46:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-10-26 22:46:46 +0000
commit033f5d2feb230a7008c0d4eea81b81da1874dd6e (patch)
treeb6ad11e27b6490a8d69a78b0cd4d97d3e8277a50
parent8101611b9f4e4884f41fe57b9e792ed8549947fe (diff)
parenta838839c7c46ca1d8326cf0c7cc554214ed5698b (diff)
Merge "Add TEST_MAPPING for input-related code"
-rw-r--r--libs/input/TEST_MAPPING7
-rw-r--r--libs/input/tests/Android.bp3
-rw-r--r--services/inputflinger/TEST_MAPPING12
-rw-r--r--services/inputflinger/tests/Android.bp1
4 files changed, 22 insertions, 1 deletions
diff --git a/libs/input/TEST_MAPPING b/libs/input/TEST_MAPPING
new file mode 100644
index 0000000000..9626d8dac7
--- /dev/null
+++ b/libs/input/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "imports": [
+ {
+ "path": "frameworks/native/services/inputflinger"
+ }
+ ]
+}
diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp
index 44147a52cc..b23aaded78 100644
--- a/libs/input/tests/Android.bp
+++ b/libs/input/tests/Android.bp
@@ -30,7 +30,8 @@ cc_test {
"liblog",
"libui",
"libutils",
- ]
+ ],
+ test_suites: ["device-tests"],
}
// NOTE: This is a compile time test, and does not need to be
diff --git a/services/inputflinger/TEST_MAPPING b/services/inputflinger/TEST_MAPPING
index 824c01eb47..33520b2ea1 100644
--- a/services/inputflinger/TEST_MAPPING
+++ b/services/inputflinger/TEST_MAPPING
@@ -7,6 +7,18 @@
"include-filter": "android.server.wm.WindowInputTests"
}
]
+ },
+ {
+ "name": "libinput_tests"
+ },
+ {
+ "name": "inputflinger_tests"
+ },
+ {
+ "name": "InputTests"
+ },
+ {
+ "name": "libinputservice_test"
}
]
}
diff --git a/services/inputflinger/tests/Android.bp b/services/inputflinger/tests/Android.bp
index 6465cc970d..8cb7194a80 100644
--- a/services/inputflinger/tests/Android.bp
+++ b/services/inputflinger/tests/Android.bp
@@ -48,4 +48,5 @@ cc_test {
"libc++fs"
],
require_root: true,
+ test_suites: ["device-tests"],
}