commit 1148407c43b29cfa7316dfc902550670277f46e4
author Julien Desprez <jdesprez@google.com> Mon Aug 19 19:36:42 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 19 19:36:42 2024 +0000
tree a067758db794ee0f799f2e95c0655cd46c8f5412
parent 8c62fc67af7ca232d9e38a0c7cbbec77e2b91c57
parent 14807185ac808ce245361e6d3c8a55c0cdc14060

Merge "Reland aosp/3144167: Migrate vts_libsnapshot_test and friends to general-tests zip" into main am: 14807185ac

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3227504

Change-Id: I0c6f31d14575c255356e0d71317debd4ebdad049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/Android.bp

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index cc6db35..f297125 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -294,7 +294,7 @@
     ],
     test_suites: [
         "vts",
-        "device-tests",
+        "general-tests",
     ],
     test_options: {
         min_shipping_api_level: 30,
@@ -311,7 +311,7 @@
         "-DLIBSNAPSHOT_TEST_VAB_LEGACY",
     ],
     test_suites: [
-        "device-tests",
+        "general-tests",
     ],
     test_options: {
         // Legacy VAB launched in Android R.
@@ -420,7 +420,7 @@
         "libstorage_literals_headers",
     ],
     test_suites: [
-        "device-tests",
+        "general-tests",
     ],
     test_options: {
         min_shipping_api_level: 30,