Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 263fa296 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android (Google) Code Review
Browse files

Merge "Use bionic platform headers."

parents 29a65ec6 7a3180d3

media/libmedia/Android.bp

+1 −11
Original line number Diff line number Diff line 
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_static { 
cc_library {

    name: "libmedia",



    defaults: [ "libmedia_defaults" ],



    srcs: [

        "IDataSource.cpp",

        "BufferingSettings.cpp",
@@ -274,6 +265,7 @@ cc_library { 
    },



    header_libs: [

        "bionic_libc_platform_headers",

        "libstagefright_headers",

        "media_ndk_headers",

    ],
@@ -339,8 +331,6 @@ cc_library { 
cc_library_static {

    name: "libmedia_player2_util",



    defaults: [ "libmedia_defaults" ],



    srcs: [

        "AudioParameter.cpp",

        "BufferingSettings.cpp",

media/libmedia/MediaUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <sys/resource.h>

#include <unistd.h>



#include <bionic_malloc.h>

#include <bionic/malloc.h>



#include "MediaUtils.h"

media/utils/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ cc_library { 
        "-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

+1 −1
Original line number Diff line number Diff line
@@ -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