| commit | 79b45db894e307816bb376093dc8a9af3de5579e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 24 01:14:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 24 01:14:36 2021 +0000 |
| tree | 3e08a027ab7b96cc71ae8c9b466eb5887f774f79 | |
| parent | f252ac79d41316e27d89fd8b68794d163e88a223 [diff] | |
| parent | 6161970fa29ea6792f4f2922c010e6adcb50243d [diff] |
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
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp index 01cd2e5..a710fa8 100644 --- a/libc/bionic/libc_init_common.cpp +++ b/libc/bionic/libc_init_common.cpp
@@ -86,6 +86,7 @@ _thread_arc4_lock(); } +__BIONIC_WEAK_FOR_NATIVE_BRIDGE void __libc_init_scudo() { // 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