commit b6826d9e88b521c5c970cf748db83b43c70d56d1
author Victor Chang <vichang@google.com> Tue Nov 20 19:11:07 2018 +0000
committer Victor Chang <vichang@google.com> Wed Jan 02 17:30:17 2019 +0000
tree f6ad0f52bc55d3c13f71f4a572a16fd80d8e26e6
parent d1265e14e77943e84a52fd7c04922280dd598899

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

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 6002e95..7d759e0 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -216,8 +216,7 @@
         "libutils",
         "libbinder",
         "libsonivox",
-        "libicuuc",
-        "libicui18n",
+        "libandroidicu",
         "libexpat",
         "libcamera_client",
         "libstagefright_foundation",
@@ -232,8 +231,7 @@
     export_shared_lib_headers: [
         "libaudioclient",
         "libbinder",
-        "libicuuc",
-        "libicui18n",
+        "libandroidicu",
         "libsonivox",
         "libmedia_omx",
     ],