commit b72a0941f6f97f6bbb117634a2a3d7bd5a121732
author Victor Chang <vichang@google.com> Thu Mar 12 12:10:39 2020 +0000
committer vichang <vichang@google.com> Mon Apr 06 11:18:35 2020 +0000
tree cc5a1779c4b799dc6a1e9edfa05e69014d639ae3
parent 0ae3173a94e56f17d0e3c6738d4296f7a2401fc8

Remove ART dependency on libicuuc

Use the headers of libandroidicu only.

Bug: 138994281
Test: m droid
Change-Id: I4af1aa40a5c9ab475fdf31ca6939ad5b54da3a2b

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index e8bfa34..4f27854 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -361,17 +361,15 @@
                 "runtime_android.cc",
                 "thread_android.cc",
             ],
+            header_libs: [
+                "libandroidicu_headers",
+            ],
             shared_libs: [
                 "libdl_android",
             ],
             static_libs: [
                 "libz", // For adler32.
             ],
-            cflags: [
-                // ART is allowed to link to libicuuc directly
-                // since they are in the same module
-                "-DANDROID_LINK_SHARED_ICU4C",
-            ],
         },
         android_arm: {
             ldflags: JIT_DEBUG_REGISTER_CODE_LDFLAGS,
@@ -391,6 +389,9 @@
                 "runtime_linux.cc",
                 "thread_linux.cc",
             ],
+            header_libs: [
+                "libicuuc_headers",
+            ],
             shared_libs: [
                 "libz", // For adler32.
             ],
@@ -405,7 +406,6 @@
     header_libs: [
         "art_cmdlineparser_headers",
         "cpp-define-generator-definitions",
-        "libicuuc_headers",
         "libnativehelper_header_only",
         "jni_platform_headers",
     ],