diff options
| author | David Drysdale <drysdale@google.com> | 2022-01-21 07:58:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-21 07:58:28 +0000 |
| commit | 4daee77052d064e9f294f78ad7e2f64a91bb0051 (patch) | |
| tree | 4266bfbd64ef97184908d8465eb98796088701b3 /keymaster | |
| parent | aca34136be92987d92e4abe2711a516b2c4b3047 (diff) | |
| parent | f3e239fc36b49496d9160455519eafcc2c1b57b5 (diff) | |
Merge "Turn off CFI for other Keymaster VTS versions"
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/3.0/vts/functional/Android.bp | 8 | ||||
| -rw-r--r-- | keymaster/4.1/vts/functional/Android.bp | 3 |
2 files changed, 10 insertions, 1 deletions
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, + }, } |