From f3e239fc36b49496d9160455519eafcc2c1b57b5 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Wed, 19 Jan 2022 19:05:07 +0000
Subject: [PATCH] Turn off CFI for other Keymaster VTS versions

Repeat the change for the 4.0 KeyMaster VTS tests in 3.0 and 4.1.

See previous change: I12b145dad5535846d68c97954d31a93123bb95e7

Bug: 206498742
Test: VtsHalKeymasterV4_1TargetTest, VtsHalKeymasterV3_0TargetTest
Change-Id: I3b4f9bc13e155ff451d03318d114a01abbbf138e
---
 keymaster/3.0/vts/functional/Android.bp | 8 +++++++-
 keymaster/4.1/vts/functional/Android.bp | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp
index e2ae80373f..39bec3fffa 100644
--- 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,
+    },
 }
diff --git a/keymaster/4.1/vts/functional/Android.bp b/keymaster/4.1/vts/functional/Android.bp
index c650bec258..547ce38f60 100644
--- 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,
+    },
 }