diff options
| author | Cindy Zhou <zhouci@google.com> | 2021-01-20 02:17:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 02:17:24 +0000 |
| commit | 7c137d556edd03b2ca504bbe0c5f53629f462f92 (patch) | |
| tree | ee90ef1acf0005ca22b6ccf59688ef1e62f862d1 | |
| parent | 048ed1ba3a9a7123dce8003298ee24ad0edd3f8f (diff) | |
| parent | 4dc91cbd9be1d7f17f0fc692d8f352d756969ce6 (diff) | |
| download | libvpx-7c137d556edd03b2ca504bbe0c5f53629f462f92.tar.gz | |
Merge "Enable cfi for libvpx" am: 9c8333802e am: 4dc91cbd9b
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1516801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6849b8bccc97fcfbd1b1af0930a3b5b332b3f246
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | libvpx_blocklist.txt | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 1f7333b59..6e84e3c5c 100644 --- a/Android.bp +++ b/Android.bp @@ -1098,6 +1098,14 @@ cc_library { darwin: { enabled: false, }, + android: { + sanitize: { + cfi: true, + config: { + cfi_assembly_support: true, + }, + }, + }, }, arch: { @@ -1144,8 +1152,6 @@ cc_library { sanitize: { integer_overflow: true, misc_undefined: ["bounds"], - // Enable CFI if this becomes a shared library. - // cfi: true, blocklist: "libvpx_blocklist.txt", }, min_sdk_version: "29", diff --git a/libvpx_blocklist.txt b/libvpx_blocklist.txt index df3e36c1d..c9ea142e3 100644 --- a/libvpx_blocklist.txt +++ b/libvpx_blocklist.txt @@ -1,6 +1,3 @@ -[cfi] -src:*external/libvpx/* - [integer] # Performance related fun:read_bool |