Merge changes I29453595,I6586c8e5 am: 0f7b66b604

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

Change-Id: I08bfb087b39942fb3fe1620aa1a18899470eca67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2022-07-14 17:49:27 +00:00 committed by Automerger Merge Worker
commit 1cf73b36ec

View file

@ -28,8 +28,8 @@ static int GetVsrLevel() {
}
TEST(fs, ErofsSupported) {
// U and higher for this test.
if (GetVsrLevel() <= __ANDROID_API_T__) {
// T-launch GKI kernels and higher must support EROFS.
if (GetVsrLevel() < __ANDROID_API_T__) {
GTEST_SKIP();
}