commit 7a3180d3c87bc91561e0a61ff5bc662ea6a1e627
author Christopher Ferris <cferris@google.com> Wed Sep 11 19:08:13 2019 -0700
committer Christopher Ferris <cferris@google.com> Wed Sep 11 19:08:13 2019 -0700
tree 045f5594e9197d9f7515407c47bbcb566065aa9d
parent b646c8721fc60df3abe7a49c726a1f2ac223a3e6

Use bionic platform headers.

Bug: 130763340

Test: Builds.
Change-Id: I8cabd441431cd357bf2842bb40809db5a3ad171e

media/utils/Android.bp

diff --git a/media/utils/Android.bp b/media/utils/Android.bp
index 0ed92f7..2dbc476 100644
--- a/media/utils/Android.bp
+++ b/media/utils/Android.bp
@@ -45,10 +45,10 @@
         "-Werror",
     ],
 
-    include_dirs: [
-        // For android_mallopt definitions.
-        "bionic/libc/private"
+    header_libs: [
+        "bionic_libc_platform_headers",
     ],
+
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 }

media/utils/MemoryLeakTrackUtil.cpp

diff --git a/media/utils/MemoryLeakTrackUtil.cpp b/media/utils/MemoryLeakTrackUtil.cpp
index 2988b52..6166859 100644
--- a/media/utils/MemoryLeakTrackUtil.cpp
+++ b/media/utils/MemoryLeakTrackUtil.cpp
@@ -22,7 +22,7 @@
 #include "media/MemoryLeakTrackUtil.h"
 #include <sstream>
 
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 
 /*
  * The code here originally resided in MediaPlayerService.cpp