Merge "Use blocklist sub-property in sanitize" am: 2b48a52398 am: 8bca87a027 am: f9ff2b6103
Original change: 1375199
Change-Id: I036f2f760d029e65fa7c4eab8950d83d8c957b06
This commit is contained in:
commit
c1b446b209
2 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue