Merge "[GWP-ASan] Maybe initialise GWP-ASan from Zygote."

This commit is contained in:
Mitch Phillips
2020-02-10 23:35:26 +00:00
committed by Gerrit Code Review

View File

@@ -579,6 +579,12 @@ static void PreApplicationInit() {
// Set the jemalloc decay time to 1. // Set the jemalloc decay time to 1.
mallopt(M_DECAY_TIME, 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) { static void SetUpSeccompFilter(uid_t uid, bool is_child_zygote) {