Merge "Do no use libandroidicu for host targets"

2019-07-01 09:38:33 +00:00
parent 1d8b9961bc 1d2783018e
commit 4377d5637f
1 changed files with 5 additions and 1 deletions
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -100,7 +100,6 @@ cc_library_shared {
    ],

    shared_libs: [
-        "libandroidicu",
        "libbase",
        "libcutils",
        "libharfbuzz_ng",
@@ -267,6 +266,7 @@ cc_library_shared {
            ],

            shared_libs: [
+                "libandroidicu",
                "libbpf_android",
                "libnetdbpf",
                "libnetdutils",
@@ -344,6 +344,10 @@ cc_library_shared {
            include_dirs: [
                "external/vulkan-headers/include",
            ],
+            shared_libs: [
+                "libicui18n",
+                "libicuuc",
+            ],
            static_libs: [
                "libandroidfw",
                "libcompiler_rt",