commit 08074ea6e991ef00ce96121d72b6c401a4461500
author Roland Levillain <rpl@google.com> Wed Apr 06 09:44:32 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 06 09:44:32 2022 +0000
tree 29b826ccd84c9eca867f4c759b61e13c8af303af
parent 438f4a210841e539f5663931a6e640f1ebb24921
parent 6bb955262a59d3819cbdf160d796c0cadf00099d

Merge "Move `libnativehelper` tests from `device-tests` to `general-tests`."

tests/Android.bp

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"],

tests_mts/Android.bp

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",
     ],
 }