commit 4daee77052d064e9f294f78ad7e2f64a91bb0051
author David Drysdale <drysdale@google.com> Fri Jan 21 07:58:28 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 21 07:58:28 2022 +0000
tree 4266bfbd64ef97184908d8465eb98796088701b3
parent aca34136be92987d92e4abe2711a516b2c4b3047
parent f3e239fc36b49496d9160455519eafcc2c1b57b5

Merge "Turn off CFI for other Keymaster VTS versions"

keymaster/3.0/vts/functional/Android.bp

diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp
index e2ae803..39bec3f 100644
--- a/keymaster/3.0/vts/functional/Android.bp
+++ b/keymaster/3.0/vts/functional/Android.bp
@@ -38,5 +38,11 @@
         "libcrypto_static",
         "libsoftkeymasterdevice",
     ],
-    test_suites: ["general-tests", "vts"],
+    test_suites: [
+        "general-tests",
+        "vts",
+    ],
+    sanitize: {
+        cfi: false,
+    },
 }

keymaster/4.1/vts/functional/Android.bp

diff --git a/keymaster/4.1/vts/functional/Android.bp b/keymaster/4.1/vts/functional/Android.bp
index c650bec..547ce38 100644
--- a/keymaster/4.1/vts/functional/Android.bp
+++ b/keymaster/4.1/vts/functional/Android.bp
@@ -48,4 +48,7 @@
         "general-tests",
         "vts",
     ],
+    sanitize: {
+        cfi: false,
+    },
 }