commit 001c3ebd352be463f78eb77edb8cc61938873eed
author Jerome Gaillard <jgaillard@google.com> Thu Dec 06 11:58:40 2018 +0000
committer Jerome Gaillard <jgaillard@google.com> Thu Dec 06 15:22:38 2018 +0000
tree 935b739f7ebff11453eef3f6a7a6fc8400faa2f4
parent 98efdcbfc50ce002f27f9f94f8c76a4662ee65a1

Enable libicuuc for Windows

This is needed to use skia in Android Studio for Windows.
This makes libicuuc_studata a shared library as this is required for
Windows.

Test: sdk build
Change-Id: I4044f2a8130153c34053e1c3dce624fada97684e

icu4c/source/Android.bp

diff --git a/icu4c/source/Android.bp b/icu4c/source/Android.bp
index 5a5c11d..b5203e8 100644
--- a/icu4c/source/Android.bp
+++ b/icu4c/source/Android.bp
@@ -17,7 +17,7 @@
     "i18n",
 ]
 
-cc_library_static {
+cc_library {
     name: "libicuuc_stubdata",
     host_supported: true,
     srcs: ["stubdata/stubdata.cpp"],
@@ -27,4 +27,9 @@
         "-Werror",
     ],
     cppflags: ["-std=c++11"],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }

icu4c/source/common/Android.bp

diff --git a/icu4c/source/common/Android.bp b/icu4c/source/common/Android.bp
index 953ebc1..165da2c 100644
--- a/icu4c/source/common/Android.bp
+++ b/icu4c/source/common/Android.bp
@@ -66,5 +66,17 @@
     host_supported: true,
     unique_host_soname: true,
     defaults: ["libicuuc_defaults"],
-    static_libs: ["libicuuc_stubdata"],
+    target: {
+        android: {
+            static_libs: ["libicuuc_stubdata"],
+        },
+        not_windows: {
+            static_libs: ["libicuuc_stubdata"],
+        },
+        windows: {
+            enabled: true,
+            // Windows requires importing data as a DLL when building with U_COMMON_IMPLEMENTATION
+            shared_libs: ["libicuuc_stubdata"],
+        },
+    },
 }