[automerger skipped] Merge aosp-24Q3-ts-dev am: c9a2c1748f -s ours
am skip reason: Merged-In I6ce6a9e7ea2c210e25c2a5ffadaaa6348086ea7f with SHA-1 a791e91304 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/28852770
Change-Id: I33ff35cbdf0eeb79e88af425b9a07a77478c18a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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,
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index ba79c19..efbcb5a 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -169,7 +169,7 @@
recovery_available: true,
}
-// This target will install to /system/bin/snapuserd_ramdisk
+// This target will install to /system/bin/snapuserd_ramdisk
// It will also create a symblink on /system/bin/snapuserd that point to
// /system/bin/snapuserd_ramdisk .
// This way, init can check if generic ramdisk copy exists.