From eb37fa766d5210cd8d1814008a17e00ffd7250e9 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Tue, 20 Nov 2018 19:23:35 +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.

Bug: 117094880
Test: m checkbuild
Merged-In: Iab88307452d9467ddebc0d4dfc5a4799ff54324f
Change-Id: Iab88307452d9467ddebc0d4dfc5a4799ff54324f
(cherry picked from commit 57caede3b8ab913890639390dbc3ee9af6c1726f)
---
 android/Android.bp |  5 ++---
 dist/Android.bp    | 11 ++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/android/Android.bp b/android/Android.bp
index 9173a03..849ce70 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -17,13 +17,12 @@ cc_library_static {
     include_dirs: ["external/sqlite/dist"],
     shared_libs: [
         "liblog",
-        "libicuuc",
-        "libicui18n",
+        "libandroidicu",
     ],
     target: {
         vendor: {
             cflags: ["-USQLITE_ENABLE_ICU"],
-            exclude_shared_libs: ["libicuuc", "libicui18n"],
+            exclude_shared_libs: ["libandroidicu"],
         },
     },
     export_include_dirs: ["."],
diff --git a/dist/Android.bp b/dist/Android.bp
index 12cac62..dfd29d9 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -80,8 +80,7 @@ cc_library {
                 "libdl",
                 "liblog",
                 "libutils",
-                "libicuuc",
-                "libicui18n",
+                "libandroidicu",
             ],
             cflags: ["-DSQLITE_ENABLE_ICU"],
 
@@ -96,8 +95,7 @@ cc_library {
         },
         not_windows: {
             shared_libs: [
-                "libicuuc",
-                "libicui18n",
+                "libandroidicu",
             ],
 
             // include android specific methods
@@ -108,7 +106,7 @@ cc_library {
         },
         vendor: {
             cflags: ["-USQLITE_ENABLE_ICU"],
-            exclude_shared_libs: ["libicuuc", "libicui18n"],
+            exclude_shared_libs: ["libandroidicu"],
         },
     },
 
@@ -131,8 +129,7 @@ cc_binary {
         android: {
             shared_libs: [
                 "libsqlite",
-                "libicuuc",
-                "libicui18n",
+                "libandroidicu",
                 "liblog",
                 "libutils",
             ],