diff options
| author | Haamed Gheibi <haamed@google.com> | 2022-02-09 14:35:06 -0800 |
|---|---|---|
| committer | Haamed Gheibi <haamed@google.com> | 2022-02-09 14:41:16 -0800 |
| commit | ab52181d73b04e131fd72e32d69b5123a5d6892b (patch) | |
| tree | 0ac86b537180b6fb97716b3058dfae44af9eaac7 /keymaster | |
| parent | f99b35c293439db0b7436b47b939eb8c7bf21b51 (diff) | |
| parent | 4d2548cfa7b86b79a516be9b60f6b666cc9af682 (diff) | |
Merge TP1A.220126.001
Change-Id: Ibf6bd2c20d9927fde8b2a05dde2b58bd8faea20f
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, + }, } |