Merge "Move `libnativehelper` tests from `device-tests` to `general-tests`." am: 08074ea6e9 am: dc8b296e2a am: 7d8e2a6503 am: 9b00bc0e9c am: f25c36deb6
Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2051244
Change-Id: I2c9b26668f319dd2e2bfd9978cb6f6d2dbaef4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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_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 {
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 @@
sdk_version: "test_current",
srcs: ["src/com/android/art/libnativehelper/JniHelpTest.java"],
test_suites: [
- "device-tests",
+ "general-tests",
"mts",
],
}