commit ae8987d931afc18e6a4e4a59beb0cbd4aebc6ba7
author Victor Chang <vichang@google.com> Mon Nov 26 17:53:20 2018 +0000
committer Greg Hartman <ghartman@google.com> Wed Jan 09 15:09:28 2019 -0800
tree 270b5e5cd64c647c4d91681ff987f7f725baae44
parent 58f4b5be624473323d2aad63fc59221e9c8d7be3

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.

libxml2 starts depending on libandroidicu.
On the host side, same dependency is also needed.
Note that any host binary can still depend on libicuuc directly,
since the APEX is not updatable on the host side.

Bug: 117094880
Test: m checkbuild
Change-Id: I52ee3f2600922931ceb1b55b1558135a596c69b8

host/commands/launch/Android.bp

diff --git a/host/commands/launch/Android.bp b/host/commands/launch/Android.bp
index eee57d9..eceb206 100644
--- a/host/commands/launch/Android.bp
+++ b/host/commands/launch/Android.bp
@@ -33,7 +33,6 @@
         "libcuttlefish_strings",
         "libcuttlefish_utils",
         "cuttlefish_auto_resources",
-        "libicuuc",
         "libbase",
         "libnl"
     ],
@@ -45,5 +44,5 @@
         "libxml2",
         "libjsoncpp",
     ],
-    defaults: ["cuttlefish_host_only"],
+    defaults: ["cuttlefish_host_only", "cuttlefish_libicuuc"],
 }

host/commands/stop_cvd/Android.bp

diff --git a/host/commands/stop_cvd/Android.bp b/host/commands/stop_cvd/Android.bp
index e9db668..b8322b5 100644
--- a/host/commands/stop_cvd/Android.bp
+++ b/host/commands/stop_cvd/Android.bp
@@ -26,7 +26,6 @@
         "libcuttlefish_fs",
         "libcuttlefish_utils",
         "cuttlefish_auto_resources",
-        "libicuuc",
     ],
     static_libs: [
         "libcuttlefish_host_config",
@@ -35,5 +34,5 @@
         "libgflags",
         "libxml2",
     ],
-    defaults: ["cuttlefish_host_only"],
+    defaults: ["cuttlefish_host_only", "cuttlefish_libicuuc"],
 }