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/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 8b97fbe..8de6381 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -1,10 +1,3 @@
-cc_defaults {
-    name: "libmedia_defaults",
-    include_dirs: [
-        "bionic/libc/private",
-    ],
-}
-
 cc_library_headers {
     name: "libmedia_headers",
     vendor_available: true,
@@ -227,8 +220,6 @@
 cc_library {
     name: "libmedia",
 
-    defaults: [ "libmedia_defaults" ],
-
     srcs: [
         "IDataSource.cpp",
         "BufferingSettings.cpp",
@@ -274,6 +265,7 @@
     },
 
     header_libs: [
+        "bionic_libc_platform_headers",
         "libstagefright_headers",
         "media_ndk_headers",
     ],
@@ -339,8 +331,6 @@
 cc_library_static {
     name: "libmedia_player2_util",
 
-    defaults: [ "libmedia_defaults" ],
-
     srcs: [
         "AudioParameter.cpp",
         "BufferingSettings.cpp",