diff options
| author | David Drysdale <drysdale@google.com> | 2022-01-21 09:00:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-21 09:00:45 +0000 |
| commit | 3c4fa6f8d5f7dee09f5526ba07901e9d618315bc (patch) | |
| tree | e338b2ba83e63971c3c5f4f76ade59ae50ca6118 /keymaster | |
| parent | f48b0083dd5f431014a2f03f98bec12b6314fedd (diff) | |
| parent | 7fbaeac5be92c4bca52ac5b0af83701f6bbd386f (diff) | |
Merge "Turn off CFI for other Keymaster VTS versions" am: 4daee77052 am: 23040264d1 am: c810dae469 am: 7fbaeac5be
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1954816
Change-Id: I6e820809f9a3c9b94545ff60201c3f86c87104d0
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, + }, } |