GKIComplianceTest: Account for running under a 32-bit userspace process am: 8c0777780e am: 2e5d5ac0e6 am: f09a43b027
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/2475144
Change-Id: I4d969b94850747ba068db8d81a0053f6e8bbcfa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/avb/vts_gki_compliance_test.cpp b/avb/vts_gki_compliance_test.cpp
index 413043c..0a66bc7 100644
--- a/avb/vts_gki_compliance_test.cpp
+++ b/avb/vts_gki_compliance_test.cpp
@@ -399,9 +399,10 @@
product_first_api_level = GetProductFirstApiLevel();
- /* Skip for non arm64 that do not mandate GKI yet. */
- if (runtime_info->hardwareId() != "aarch64") {
- GTEST_SKIP() << "Exempt from GKI test on non-arm64 devices";
+ /* Skip for non-arm64 kernels that do not mandate GKI yet. */
+ if (runtime_info->hardwareId() != "aarch64" &&
+ runtime_info->hardwareId() != "armv8l") {
+ GTEST_SKIP() << "Exempt from GKI test on non-arm64 kernel devices";
}
/* Skip for form factors that do not mandate GKI yet */