Merge SP1A.210122.003

Bug: 178561525

Change-Id: Ifb7c4a1c94e1f4cab710826d57282b981a46e990

1 files changed, 9 insertions, 0 deletions

diff --git a/cmds/app_process/Android.bp b/cmds/app_process/Android.bp
index c1f9b6aea2ed..ba3eea70838c 100644
--- a/cmds/app_process/Android.bp
+++ b/cmds/app_process/Android.bp
@@ -63,4 +63,13 @@ cc_binary {
     // Create a symlink from app_process to app_process32 or 64
     // depending on the target configuration.
     symlink_preferred_arch: true,
+
+    // Enable ASYNC MTE in the zygote, in order to allow apps and the system
+    // server to use MTE. We use ASYNC because we don't expect the pre-fork
+    // zygote to have substantial memory corruption bugs (as it's primarily Java
+    // code), and we don't want to waste memory recording malloc/free stack
+    // traces (which happens in SYNC mode).
+    sanitize: {
+        memtag_heap: true,
+    },
 }