commit 2a57937f9605774d46a4cf2ac5d5b185eb9c4bd9
author Xin Li <delphij@google.com> Thu Aug 27 10:16:29 2020 -0700
committer Xin Li <delphij@google.com> Thu Aug 27 10:16:29 2020 -0700
tree 25c444ddad0491c17e7efbe62b5befbeae4638b4
parent 667129de5806a183f9fbb4371e3d691afd3065cb
parent 08590b8f332ba3e2771953607be2c3f703edfde7

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Id8ad6ce0b8f22cff73bff3c34f092021d99158bd
Change-Id: I908ebc0537b77bd31f31e259d3edf20647a5e7bb

Android.bp

diff --git a/Android.bp b/Android.bp
index 448ebb6..1f7333b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1146,7 +1146,7 @@
         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",
 }

Android.bp.in

diff --git a/Android.bp.in b/Android.bp.in
index 612551c..8ed278f 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -56,7 +56,7 @@
         misc_undefined: ["bounds"],
         // Enable CFI if this becomes a shared library.
         // cfi: true,
-        blacklist: "libvpx_blacklist.txt",
+        blocklist: "libvpx_blocklist.txt",
     },
 }
 

libvpx_blocklist.txt

diff --git a/libvpx_blacklist.txt b/libvpx_blocklist.txt
similarity index 100%
rename from libvpx_blacklist.txt
rename to libvpx_blocklist.txt