aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2022-04-06 10:28:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-06 10:28:54 +0000
commit7d8e2a65030eb5f6a693bc6dfa4be50805fd711e (patch)
tree29b826ccd84c9eca867f4c759b61e13c8af303af
parent17622d241688d84e014b3c9caf9d5d7537feba27 (diff)
parentdc8b296e2a5dd2b2cbd070d64c7e453174225809 (diff)
downloadlibnativehelper-7d8e2a65030eb5f6a693bc6dfa4be50805fd711e.tar.gz
Merge "Move `libnativehelper` tests from `device-tests` to `general-tests`." am: 08074ea6e9 am: dc8b296e2a
Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2051244 Change-Id: Iddb57f887474dbce5fe36e147ad84af437f28007 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tests/Android.bp4
-rw-r--r--tests_mts/Android.bp2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index caf8131..99ec108 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -61,7 +61,7 @@ cc_defaults {
cc_test {
name: "libnativehelper_tests",
defaults: ["libnativehelper_test_defaults"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
srcs: [
"scoped_local_frame_test.cpp",
"scoped_local_ref_test.cpp",
@@ -75,7 +75,7 @@ cc_test {
cc_test {
name: "libnativehelper_lazy_tests",
defaults: ["libnativehelper_test_defaults"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
srcs: ["libnativehelper_lazy_test.cpp"],
shared_libs: ["liblog"],
static_libs: ["libnativehelper_lazy"],
diff --git a/tests_mts/Android.bp b/tests_mts/Android.bp
index 6496983..9483a62 100644
--- a/tests_mts/Android.bp
+++ b/tests_mts/Android.bp
@@ -34,7 +34,7 @@ java_defaults {
sdk_version: "test_current",
srcs: ["src/com/android/art/libnativehelper/JniHelpTest.java"],
test_suites: [
- "device-tests",
+ "general-tests",
"mts",
],
}