commit c810dae469f2365303192c6fd4ff9a0151058588
author David Drysdale <drysdale@google.com> Fri Jan 21 08:23:54 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 21 08:23:54 2022 +0000
tree bb5970d415a50a489bc5b4a8017b57c808f5b4f7
parent 8327854c0e40d4bf2fd6335817f55df1884bb6f6
parent 23040264d14ed8b20d0d5b5c490751fd382a85cf

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

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

Change-Id: I21dcc880d27eba9a3e8d849087a389f9fe180a39

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