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

Commit ba425080 authored by Victor Chang's avatar Victor Chang Committed by Automerger Merge Worker
Browse files

Merge "Avoid exporting libandroidicu headers from libmedia" am: 6d437e09 am:... 

Merge "Avoid exporting libandroidicu headers from libmedia" am: 6d437e09 am: b6530c49 am: 2ac32ce6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2382649



Change-Id: Ia67d07103a3ae134cf4561a4fa3ae36f0097717a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf857947 2ac32ce6

media/libmedia/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ cc_library { 
    export_shared_lib_headers: [

        "libaudioclient",

        "libbinder",

        "libandroidicu",

        //"libsonivox",

        "libmedia_omx",

        "framework-permission-aidl-cpp",

media/libmedia/include/media/CharacterEncodingDetector.h

+6 −3
Original line number Diff line number Diff line
@@ -21,9 +21,12 @@ 


#include "StringArray.h"



#include "unicode/ucnv.h"

#include "unicode/ucsdet.h"

#include "unicode/ustring.h"

/** Declare opaque structures from ICU4C. */

struct UConverter;

typedef struct UConverter UConverter;



struct UCharsetMatch;

typedef struct UCharsetMatch UCharsetMatch;



namespace android {