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

Commit 4b8ef498 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Organize header dependencies" into oc-mr1-dev 

am: 1ec73bea

Change-Id: Iada84e58ed34e17ad82181292b900d617912f5c9
parents 2e72a1f2 1ec73bea

media/libmedia/Android.bp

+11 −16
Original line number Diff line number Diff line 
cc_library_headers {

    name: "libmedia_headers",

    vendor_available: true,

    export_include_dirs: ["include", "omx/1.0/include"],

    header_libs: ["libstagefright_headers"],

    export_header_lib_headers: ["libstagefright_headers"],

    export_include_dirs: ["include"],

    header_libs:[

        "libstagefright_headers",

        "media_plugin_headers",

    ],

    export_header_lib_headers: [

        "libstagefright_headers",

        "media_plugin_headers",

    ],

}



cc_library {
@@ -72,13 +78,6 @@ cc_defaults { 
        "libutils",

    ],



    include_dirs: [

        "frameworks/av/include/media",

        "frameworks/native/include", // for media/hardware/MetadataBufferType.h

        "frameworks/native/include/media/openmax",

        "frameworks/av/media/libstagefright",

    ],



    export_shared_lib_headers: [

        "android.hidl.memory@1.0",

        "android.hidl.token@1.0-utils",
@@ -204,6 +203,7 @@ cc_library_shared { 
        "libicui18n",

        "libsonivox",

        "libmediadrm",

        "libmedia_helper",

        "android.hidl.memory@1.0",

    ],
@@ -212,15 +212,10 @@ cc_library_shared { 
        "libc_malloc_debug_backtrace",

    ],



    include_dirs: [

        "frameworks/native/include/media/openmax",

        "frameworks/av/include/media/",

        "frameworks/av/media/libstagefright",

    ],



    export_include_dirs: [

        "include",

    ],



    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

media/libmedia/CharacterEncodingDetector.cpp

+6 −6
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ 
#define LOG_TAG "CharacterEncodingDector"

#include <utils/Log.h>



#include <CharacterEncodingDetector.h>

#include <media/CharacterEncodingDetector.h>

#include "CharacterEncodingDetectorTables.h"



#include "utils/Vector.h"

#include "StringArray.h"

#include <utils/Vector.h>

#include <media/StringArray.h>



#include "unicode/ucnv.h"

#include "unicode/ucsdet.h"

#include "unicode/ustring.h"

#include <unicode/ucnv.h>

#include <unicode/ucsdet.h>

#include <unicode/ustring.h>



namespace android {

media/libmedia/IResourceManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define LOG_TAG "IResourceManagerService"

#include <utils/Log.h>



#include "media/IResourceManagerService.h"

#include <media/IResourceManagerService.h>



#include <binder/Parcel.h>

media/libmedia/MediaScannerClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 


#include <media/mediascanner.h>



#include "CharacterEncodingDetector.h"

#include "StringArray.h"

#include <media/CharacterEncodingDetector.h>

#include <media/StringArray.h>



namespace android {

media/libmedia/MidiDeviceInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#define LOG_TAG "MidiDeviceInfo"



#include "MidiDeviceInfo.h"

#include <media/MidiDeviceInfo.h>



#include <binder/Parcel.h>

#include <log/log.h>