commit 15b4f278535d919c032ac8615fbd956daffb870e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 21:36:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 21:36:39 2020 +0000
tree 265c6e217934f8d7a6bd9e59564566a584e5e690
parent e7b32d322860f1dc73ddc5826e68a4e601d26e08
parent 1d45a882e887274811ee51df51deb6be67f3cb6f

Merge "Fix includes for MTE builds." am: 5b9cc31442 am: ed09b0d47c am: 1d45a882e8

Change-Id: I315f2f2c648a15786937aeae68a530390433d0ba

libc/bionic/heap_tagging.cpp

diff --git a/libc/bionic/heap_tagging.cpp b/libc/bionic/heap_tagging.cpp
index 2522da5..0eaf34e 100644
--- a/libc/bionic/heap_tagging.cpp
+++ b/libc/bionic/heap_tagging.cpp
@@ -31,6 +31,7 @@
 #include "malloc_tagged_pointers.h"
 
 #include <platform/bionic/malloc.h>
+#include <platform/bionic/mte_kernel.h>
 
 static HeapTaggingLevel heap_tagging_level = M_HEAP_TAGGING_LEVEL_NONE;
 

libc/bionic/libc_init_common.cpp

diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index 070c45f..e4106e9 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -43,7 +43,6 @@
 #include <unistd.h>
 
 #include <async_safe/log.h>
-#include <platform/bionic/mte_kernel.h>
 
 #include "private/WriteProtected.h"
 #include "private/bionic_defs.h"