VtsBootconfigTest: enforce requirement from U+ This is relanding https://r.android.com/3319737 after it was reverted due to using an undefined __ANDROID_APU_U__. Test: none Bug: 376290434 Bug: 401466862 Merged-In: I3012fff70eb8a27bb81aab056817d72ac559f8d2 Change-Id: I09cd0b26bf2989e39d269da3903bf5d3acbe33f5
diff --git a/vts/VtsBootconfigTest.cpp b/vts/VtsBootconfigTest.cpp index 705940a..501e993 100644 --- a/vts/VtsBootconfigTest.cpp +++ b/vts/VtsBootconfigTest.cpp
@@ -22,14 +22,15 @@ class VtsBootconfigTest : public testing::Test {}; TEST_F(VtsBootconfigTest, ProcCmdlineAndroidbootTest) { - // This was supported in Android S with kernel version 5.10+, but really only - // required by Android T because Android still needs to support - // Android S devices that launched with 4.19 for as long as it supports - // Android S. + // This is supported and required in Android S with kernel version + // 5.10+. Devices are allowed to launch with kernels < 5.10 + // through Android T so the expectation from the Android framework, and the + // enforcement of this requirement, can only be on devices launched with + // Android U and beyond. int first_api_level = android::base::GetIntProperty( "ro.board.first_api_level", android::base::GetIntProperty("ro.vendor.api_level", 1000000)); - if (first_api_level < __ANDROID_API_T__) { + if (first_api_level <= __ANDROID_API_T__) { GTEST_SKIP() << "Bootconfig requirements do not apply"; }