Merge "Turn off CFI for other Keymaster VTS versions" am: 4daee77052 am: 23040264d1 am: c810dae469 am: 7fbaeac5be

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1954816 Change-Id: I6e820809f9a3c9b94545ff60201c3f86c87104d0
2026-02-01 11:36:00 +00:00 · 2022-01-21 09:00:45 +00:00
parent f48b0083dd 7fbaeac5be
commit 3c4fa6f8d5
2 changed files with 10 additions and 1 deletions
--- a/keymaster/3.0/vts/functional/Android.bp
+++ b/keymaster/3.0/vts/functional/Android.bp
@@ -38,5 +38,11 @@ cc_test {
        "libcrypto_static",
        "libsoftkeymasterdevice",
    ],
-    test_suites: ["general-tests", "vts"],
+    test_suites: [
+        "general-tests",
+        "vts",
+    ],
+    sanitize: {
+        cfi: false,
+    },
 }
--- a/keymaster/4.1/vts/functional/Android.bp
+++ b/keymaster/4.1/vts/functional/Android.bp
@@ -48,4 +48,7 @@ cc_test {
        "general-tests",
        "vts",
    ],
+    sanitize: {
+        cfi: false,
+    },
 }