commit 3b4874d5d3a0f4ca8579e6dead187ad98c67e609
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 10 00:30:21 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 10 00:30:21 2023 +0000
tree 259a4e2a3d4ba73217dee02811c0080fdf7d5d7f
parent 467541c420647e1cac0e0e09a3193e7a01691409
parent c426e499889d3162b1647a7c55866be4ff58b01c

Snap for 9720638 from c426e499889d3162b1647a7c55866be4ff58b01c to tm-qpr3-release

Change-Id: I7bd80ec6a3b844870f29d93cc6505a6670a3aa08

avb/vts_gki_compliance_test.cpp

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 */