Deprecate vendor_dlkm test
The requirement for the vendor_dlkm partition is dropped for Android16
and onwards, so remove it from VTS. The previous patch fd169955b8e8
("Deprecate vendor_dlkm test for Android 16 and later") removed the
system_dlkm test by accident. This patch will only target the
vendor_dlkm test.
Bug: 376929161
Bug: 370079417
Bug: 376930267
Bug: 374994897
Bug: 374994659
Test: atest vts_dlkm_partition_test
Change-Id: I498f40976d0fea3df6717ed6884b6d7605b3de28
Signed-off-by: Edward Liaw <[email protected]>
(cherry picked from commit 70ca1dd5cfcf71fa0eb9989ba293fd44e9219ea8)
diff --git a/gki/vts_dlkm_partition_test.cpp b/gki/vts_dlkm_partition_test.cpp
index f1c832e..e91d4b1 100644
--- a/gki/vts_dlkm_partition_test.cpp
+++ b/gki/vts_dlkm_partition_test.cpp
@@ -139,29 +139,6 @@
int product_first_api_level;
};
-TEST_F(DlkmPartitionTest, VendorDlkmPartition) {
- if (vendor_api_level < __ANDROID_API_S__) {
- GTEST_SKIP()
- << "Exempt from vendor_dlkm partition test. ro.vendor.api_level ("
- << vendor_api_level << ") < " << __ANDROID_API_S__;
- }
- // Only enforce this test on products launched with Android T and later.
- if (product_first_api_level < __ANDROID_API_T__) {
- GTEST_SKIP() << "Exempt from vendor_dlkm partition test. "
- "ro.product.first_api_level ("
- << product_first_api_level << ") < " << __ANDROID_API_T__;
- }
- if (runtime_info->kernelVersion().dropMinor() !=
- android::vintf::Version{5, 4} &&
- runtime_info->kernelVersion().dropMinor() <
- android::vintf::Version{5, 10}) {
- GTEST_SKIP() << "Exempt from vendor_dlkm partition test. kernel: "
- << runtime_info->kernelVersion();
- }
- ASSERT_NO_FATAL_FAILURE(VerifyDlkmPartition("vendor"));
- ASSERT_NO_FATAL_FAILURE(VerifyDlkmPartition("odm"));
-}
-
TEST_F(DlkmPartitionTest, SystemDlkmPartition) {
if (vendor_api_level < __ANDROID_API_T__) {
GTEST_SKIP()
