From 18576e5ab1cf3099a33a3038a5fc58e8c925b018 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Tue, 20 Nov 2018 18:44:46 +0000
Subject: [PATCH] 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: I1a8e5d7ddb0beed61257706003d93ac4d5f9566f
---
 core/jni/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index b5860d8a5bc32..c81a77d4c16e3 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -264,7 +264,7 @@ cc_library_shared {
         "libhardware",
         "libhardware_legacy",
         "libselinux",
-        "libicuuc",
+        "libandroidicu",
         "libmedia",
         "libmediametrics",
         "libaudioclient",