commit f9ff2b61034fc191f45fe93ca87b971cd539514a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 30 23:06:26 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 30 23:06:26 2020 +0000
tree 75a741348ef10fa46dca98b9b83120a18a00a344
parent 151a2bcee71b5624fefca0e01d24bd3df9c78769
parent 8bca87a027d34962d0fb2283d6d408ee09b00472

Merge "Use blocklist sub-property in sanitize" am: 2b48a52398 am: 8bca87a027

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1375199

Change-Id: I24643fae4ea0d0f27cc206fe1cc492c0324fcbdc

Android.bp

diff --git a/Android.bp b/Android.bp
index 500bbf6..5ba9c7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -230,7 +230,7 @@
         misc_undefined: ["bounds"],
         // Enable CFI if this becomes a shared library.
         // cfi: true,
-        blacklist: "libavc_blacklist.txt",
+        blocklist: "libavc_blocklist.txt",
     },
     apex_available: [
         "//apex_available:platform", // used by libstagefright_soft_avcdec
@@ -491,7 +491,7 @@
         misc_undefined: ["bounds"],
         // Enable CFI if this becomes a shared library.
         // cfi: true,
-        blacklist: "libavc_blacklist.txt",
+        blocklist: "libavc_blocklist.txt",
     },
     apex_available: [
         "//apex_available:platform", //due to libstagefright_soft_avcenc

libavc_blocklist.txt

diff --git a/libavc_blacklist.txt b/libavc_blocklist.txt
similarity index 100%
rename from libavc_blacklist.txt
rename to libavc_blocklist.txt