diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-31 16:27:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 16:27:57 +0000 |
| commit | c6b67bce25e7f692628bcc2e690295a8d2db4271 (patch) | |
| tree | 25c444ddad0491c17e7efbe62b5befbeae4638b4 | |
| parent | 3aa6565c9b2092b08e3812567c78cce274698c11 (diff) | |
| parent | 369bcd4b99735efe8e6a1952ef2b3c87f64e5b54 (diff) | |
| download | libvpx-c6b67bce25e7f692628bcc2e690295a8d2db4271.tar.gz | |
Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487 am: 667129de58 am: 369bcd4b99
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719
Change-Id: I2a724f57398b0b17fdf5a86877d12c154933fc3d
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | Android.bp.in | 2 | ||||
| -rw-r--r-- | libvpx_blocklist.txt (renamed from libvpx_blacklist.txt) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 448ebb62a..1f7333b59 100644 --- a/Android.bp +++ b/Android.bp @@ -1146,7 +1146,7 @@ cc_library { misc_undefined: ["bounds"], // Enable CFI if this becomes a shared library. // cfi: true, - blacklist: "libvpx_blacklist.txt", + blocklist: "libvpx_blocklist.txt", }, min_sdk_version: "29", } diff --git a/Android.bp.in b/Android.bp.in index 612551c88..8ed278fdb 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -56,7 +56,7 @@ cc_library { misc_undefined: ["bounds"], // Enable CFI if this becomes a shared library. // cfi: true, - blacklist: "libvpx_blacklist.txt", + blocklist: "libvpx_blocklist.txt", }, } diff --git a/libvpx_blacklist.txt b/libvpx_blocklist.txt index df3e36c1d..df3e36c1d 100644 --- a/libvpx_blacklist.txt +++ b/libvpx_blocklist.txt |