Merge "[GWP-ASan] Disable for apps." into rvc-dev am: cc6101236a am: 25c6573d38

Change-Id: Ib9863a8db5ac321d59dc8e53bff4550fd9c95a9f
2020-02-27 00:54:59 +00:00
parent c17cf052aa 25c6573d38
commit 8a68d838b8
1 changed files with 0 additions and 6 deletions
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -626,12 +626,6 @@ 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) {