commit f36cccb50b189965177ecd7bdc3b3f36ad207fa6
author Victor Chang <vichang@google.com> Tue Nov 20 19:11:07 2018 +0000
committer Victor Chang <vichang@google.com> Mon Jan 07 18:36:10 2019 +0000
tree fc90e02d7d10e42bb9665678d9ac85437ae4cd5a
parent 1ce37f1de3f7185ccffd4d9145b036941a582fe4

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 b6826d9e88b521c5c970cf748db83b43c70d56d1)

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index f9e7b95..2a2d1bc 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -205,8 +205,7 @@
         "libutils",
         "libbinder",
         "libsonivox",
-        "libicuuc",
-        "libicui18n",
+        "libandroidicu",
         "libexpat",
         "libcamera_client",
         "libstagefright_foundation",
@@ -221,8 +220,7 @@
     export_shared_lib_headers: [
         "libaudioclient",
         "libbinder",
-        "libicuuc",
-        "libicui18n",
+        "libandroidicu",
         "libsonivox",
         "libmedia_omx",
     ],