Merge "Make __libc_init_scudo() weak for native bridge." am: 6161970fa2

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1603833

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I798977625e5f959e5b15dc535a311ffc4b752607
This commit is contained in:
Treehugger Robot 2021-02-24 01:14:36 +00:00 committed by Automerger Merge Worker
commit 79b45db894

View file

@ -86,6 +86,7 @@ static void arc4random_fork_handler() {
_thread_arc4_lock(); _thread_arc4_lock();
} }
__BIONIC_WEAK_FOR_NATIVE_BRIDGE
void __libc_init_scudo() { void __libc_init_scudo() {
// Heap tagging level *must* be set before interacting with Scudo, otherwise // Heap tagging level *must* be set before interacting with Scudo, otherwise
// the primary will be mapped with PROT_MTE even if MTE is is not enabled in // the primary will be mapped with PROT_MTE even if MTE is is not enabled in