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

Original change: 1375199

Change-Id: I24643fae4ea0d0f27cc206fe1cc492c0324fcbdc
This commit is contained in:
Treehugger Robot 2020-07-30 23:06:26 +00:00 committed by Automerger Merge Worker
commit f9ff2b6103
2 changed files with 2 additions and 2 deletions

View file

@ -230,7 +230,7 @@ cc_library_static {
misc_undefined: ["bounds"], misc_undefined: ["bounds"],
// Enable CFI if this becomes a shared library. // Enable CFI if this becomes a shared library.
// cfi: true, // cfi: true,
blacklist: "libavc_blacklist.txt", blocklist: "libavc_blocklist.txt",
}, },
apex_available: [ apex_available: [
"//apex_available:platform", // used by libstagefright_soft_avcdec "//apex_available:platform", // used by libstagefright_soft_avcdec
@ -491,7 +491,7 @@ cc_library_static {
misc_undefined: ["bounds"], misc_undefined: ["bounds"],
// Enable CFI if this becomes a shared library. // Enable CFI if this becomes a shared library.
// cfi: true, // cfi: true,
blacklist: "libavc_blacklist.txt", blocklist: "libavc_blocklist.txt",
}, },
apex_available: [ apex_available: [
"//apex_available:platform", //due to libstagefright_soft_avcenc "//apex_available:platform", //due to libstagefright_soft_avcenc