diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-05 21:45:09 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-05 21:45:09 +0000 |
| commit | 6c26f738e38b3cf498ae5fed8bbebe9b513cab86 (patch) | |
| tree | 50072abe5828c3c5c8a64cd202e8717ac38fd97c | |
| parent | 50d084668d8898af59940ca761323f640e3a3268 (diff) | |
| parent | 872228058d0ba8809e4ec39ee5cd77183ec9d451 (diff) | |
Merge cherrypicks of [3423221, 3422977] into pi-release
Change-Id: Ic27d982f001ac0a4ea510fdca6fade607e721f95
| -rw-r--r-- | keystore/tests/Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp index 0ddaa00..227f88f 100644 --- a/keystore/tests/Android.bp +++ b/keystore/tests/Android.bp @@ -23,4 +23,7 @@ cc_test { "liblog", ], shared_libs: ["libkeymaster_messages"], + sanitize: { + cfi: false, + } } |