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
Change-Id: Ida6aac85dfb79bf8e7a3a2540e567ee211279e09
gugelfrei
Victor Chang 6 years ago
parent d1265e14e7
commit b6826d9e88

@ -29,8 +29,7 @@ cc_library_shared {
srcs: ["src/FwdLockEngine.cpp"],
shared_libs: [
"libicui18n",
"libicuuc",
"libandroidicu",
"libutils",
"liblog",
"libdl",

@ -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",
],

@ -20,7 +20,7 @@ LOCAL_SHARED_LIBRARIES := \
libmediaplayerservice \
libutils \
libbinder \
libicuuc \
libandroidicu \
android.hardware.media.omx@1.0 \
LOCAL_STATIC_LIBRARIES := \

@ -85,7 +85,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

@ -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

Loading…
Cancel
Save