commit 9e736316ece84f1f189f8cb9453cc21b24bd553e
author vichang <vichang@google.com> Mon Dec 17 15:28:56 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 17 15:28:56 2018 +0000
tree 0109e40fb05088c755b633389f46489ead0bf9d7
parent 570886357e2c91ac913f34abdaf559432ce00853
parent 0a2cdf39c51edbaf37ab1ced82326c340698c1c3

Merge "Include ICU4C cc_library_headers instead of a directory"

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index 4780f16..71c5b74 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -345,6 +345,11 @@
             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,
@@ -377,12 +382,12 @@
     export_generated_headers: ["cpp-define-generator-asm-support"],
     include_dirs: [
         "art/sigchainlib",
-        "external/icu/icu4c/source/common",
         "external/zlib",
     ],
     header_libs: [
         "art_cmdlineparser_headers",
         "cpp-define-generator-definitions",
+        "libicuuc_headers",
         "libnativehelper_header_only",
         "jni_platform_headers",
     ],