diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index a09c0b38eb2d8..7a93d8db09319 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -579,6 +579,12 @@ static void PreApplicationInit() { // Set the jemalloc decay time to 1. mallopt(M_DECAY_TIME, 1); + + // Maybe initialize GWP-ASan here. Must be called after + // mallopt(M_SET_ZYGOTE_CHILD). + bool ForceEnableGwpAsan = false; + android_mallopt(M_INITIALIZE_GWP_ASAN, &ForceEnableGwpAsan, + sizeof(ForceEnableGwpAsan)); } static void SetUpSeccompFilter(uid_t uid, bool is_child_zygote) {