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

Commit b6a2daca authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
Browse files

Merge "Use ICU in libandroidicu"

parents 03de12c4 b6826d9e

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ cc_library_shared { 
    srcs: ["src/FwdLockEngine.cpp"],



    shared_libs: [

        "libicui18n",

        "libicuuc",

        "libandroidicu",

        "libutils",

        "liblog",

        "libdl",

media/libmedia/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -216,8 +216,7 @@ cc_library { 
        "libutils",

        "libbinder",

        "libsonivox",

        "libicuuc",

        "libicui18n",

        "libandroidicu",

        "libexpat",

        "libcamera_client",

        "libstagefright_foundation",
@@ -232,8 +231,7 @@ cc_library { 
    export_shared_lib_headers: [

        "libaudioclient",

        "libbinder",

        "libicuuc",

        "libicui18n",

        "libandroidicu",

        "libsonivox",

        "libmedia_omx",

    ],

media/mediaserver/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libmediaplayerservice \

        libutils \

        libbinder \

        libicuuc \

        libandroidicu \

        android.hardware.media.omx@1.0 \



LOCAL_STATIC_LIBRARIES := \

services/audiopolicy/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES += libmedia_helper

LOCAL_SHARED_LIBRARIES += libmediametrics



LOCAL_SHARED_LIBRARIES += libhidlbase libicuuc libxml2

LOCAL_SHARED_LIBRARIES += libhidlbase libxml2



ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

services/mediaextractor/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ LOCAL_REQUIRED_MODULES_x86_64 := crash_dump.policy mediaextractor.policy 


LOCAL_SRC_FILES := main_extractorservice.cpp

LOCAL_SHARED_LIBRARIES := libmedia libmediaextractorservice libbinder libutils \

    liblog libbase libicuuc libavservices_minijail

    liblog libbase libandroidicu libavservices_minijail

LOCAL_STATIC_LIBRARIES := libicuandroid_utils

LOCAL_MODULE:= mediaextractor

LOCAL_INIT_RC := mediaextractor.rc