Merge "Turn off CFI for other Keymaster VTS versions"

2022-01-21 07:58:28 +00:00 · 2022-01-21 07:58:28 +00:00 · 4daee77052
commit 4daee77052
parent aca34136be f3e239fc36
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,
+    },
 }