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

Commit f36cccb5 authored by Victor Chang's avatar Victor Chang
Browse files

Use ICU in libandroidicu 

libicuuc and libicui18n are moved into APEX, but
they have no stable ABI due to the version suffix.

Use libandroidicu which provides stable symbol.
See http://go/apex-stable-icu4c-interface for the design.
See http://aosp/801855 for libandroidicu implementation.

Bug: 117094880
Test: m checkbuild
Merged-In: Ida6aac85dfb79bf8e7a3a2540e567ee211279e09
Change-Id: Ida6aac85dfb79bf8e7a3a2540e567ee211279e09
(cherry picked from commit b6826d9e)
parent 1ce37f1d

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
@@ -205,8 +205,7 @@ cc_library { 
        "libutils",

        "libbinder",

        "libsonivox",

        "libicuuc",

        "libicui18n",

        "libandroidicu",

        "libexpat",

        "libcamera_client",

        "libstagefright_foundation",
@@ -221,8 +220,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
@@ -83,7 +83,7 @@ LOCAL_SHARED_LIBRARIES += libmedia_helper 
LOCAL_SHARED_LIBRARIES += libmediametrics



ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_SHARED_LIBRARIES += libicuuc libxml2

LOCAL_SHARED_LIBRARIES += libxml2



LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

services/mediaextractor/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ LOCAL_REQUIRED_MODULES += \ 


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