From ffda48e959c63131c17d3ef5476655cc974fa041 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 13 Jul 2022 20:51:43 +0000 Subject: [PATCH 1/2] Revert "Do not enforce EROFS for android-T and below." This reverts commit a571d4a9bcb96d0a797bd3c99008a40c413503d4. Reason for revert: Incorrect fix Change-Id: I6586c8e53cc89418d1802807a1a2e108f7e825d3 --- fs_mgr/tests/vts_fs_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index 3f1210396..aac2cfd9b 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -28,8 +28,8 @@ static int GetVsrLevel() { } TEST(fs, ErofsSupported) { - // U and higher for this test. - if (GetVsrLevel() <= __ANDROID_API_T__) { + // S and higher for this test. + if (GetVsrLevel() < __ANDROID_API_S__) { GTEST_SKIP(); } From c2f95c4b793a6b6eaccf7840b05327eec33475a7 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 13 Jul 2022 16:45:11 -0700 Subject: [PATCH 2/2] vts_fs_test: Only require EROFS in T+ kernels. Bug: 237765186 Test: vts_fs_test Change-Id: I294535953bfbe0f246347487b746d3adf2fca1aa --- fs_mgr/tests/vts_fs_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index aac2cfd9b..ae8e45992 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -28,8 +28,8 @@ static int GetVsrLevel() { } TEST(fs, ErofsSupported) { - // S and higher for this test. - if (GetVsrLevel() < __ANDROID_API_S__) { + // T-launch GKI kernels and higher must support EROFS. + if (GetVsrLevel() < __ANDROID_API_T__) { GTEST_SKIP(); }