commit 4377d5637ffe8ba3e0dc53d9d12b0bb5cce148c2
author Jerome Gaillard <jgaillard@google.com> Mon Jul 01 09:38:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 01 09:38:33 2019 +0000
tree 6d8cbcd182f2ada9cecff20ce3bc5d692d0ccc6b
parent 1d8b9961bc0f27ec7ad0f792d6d9f6ffe8cdf83c
parent 1d2783018e2ed32d22833c68c7438149d2f1a571

Merge "Do no use libandroidicu for host targets"

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index b21221f..b50b824 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -100,7 +100,6 @@
     ],
 
     shared_libs: [
-        "libandroidicu",
         "libbase",
         "libcutils",
         "libharfbuzz_ng",
@@ -267,6 +266,7 @@
             ],
 
             shared_libs: [
+                "libandroidicu",
                 "libbpf_android",
                 "libnetdbpf",
                 "libnetdutils",
@@ -344,6 +344,10 @@
             include_dirs: [
                 "external/vulkan-headers/include",
             ],
+            shared_libs: [
+                "libicui18n",
+                "libicuuc",
+            ],
             static_libs: [
                 "libandroidfw",
                 "libcompiler_rt",