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

Change-Id: I9aa4f5bba27d2017b16df76dd7b6412b13fb980d

core/jni/com_android_internal_os_Zygote.cpp

@@ -611,6 +611,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) {