commit 7fbaeac5be92c4bca52ac5b0af83701f6bbd386f
author David Drysdale <drysdale@google.com> Fri Jan 21 08:42:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 21 08:42:42 2022 +0000
tree 9e7296a3ee86edb85e7519768934f0d51178a0a8
parent d8c6a0a40cdf92486904eef5be707e5cbd9d2180
parent c810dae469f2365303192c6fd4ff9a0151058588

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

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1954816

Change-Id: I3396a0944bd594d2d685e909c8dbb268f560ac08

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,
+    },
 }