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

Change-Id: I2fc64ff4d59e7089619be82eb7ef9907bf0de04c

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) {