commit 72bf4b3e235d7d7187eed6daa6263519eb6c2f69
author vichang <vichang@google.com> Mon Oct 28 11:20:59 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 28 11:20:59 2019 +0000
tree 92f449ec51032d68d351cde2fa7a4c4f7957aeed
parent c0cb578fe6f757182b957c40959c98504746ea31
parent 37227bde677ad64f576c3009605a06712d97ef4c

Merge "Move NativeConverter and java.nio.charset into core-icu4j"

android_icu4j/Android.bp

diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index e0024c0..9725b81 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -152,9 +152,7 @@
     java_version: "1.9",
     installable: false,
     sdk_version: "none",
-    libs: [
-        "art.module.public.api.stubs",
-    ],
+    system_modules: "art-module-public-api-stubs-system-modules",
 }
 
 // A stubs target containing the parts of the public SDK API provided by the i18n module.
@@ -192,9 +190,7 @@
         ":android_icu4j_src_files",
     ],
     sdk_version: "none",
-    libs: [
-        "art.module.intra.core.api.stubs",
-    ],
+    system_modules: "art-module-intra-core-api-stubs-system-modules",
 
     installable: false,
     args: "--hide-annotation libcore.api.Hide " +
@@ -245,9 +241,7 @@
         ":android_icu4j_src_files",
     ],
     sdk_version: "none",
-    libs: [
-        "art.module.platform.api.stubs",
-    ],
+    system_modules: "art-module-platform-api-stubs-system-modules",
 
     installable: false,
     args: "--hide-annotation libcore.api.Hide " +

icu4c/source/i18n/Android.bp

diff --git a/icu4c/source/i18n/Android.bp b/icu4c/source/i18n/Android.bp
index ad83fa3..50fe25a 100644
--- a/icu4c/source/i18n/Android.bp
+++ b/icu4c/source/i18n/Android.bp
@@ -45,10 +45,6 @@
         },
         windows: {
             enabled: true,
-            cflags: [
-                "-Wno-ignored-attributes", // ICU-20356
-                "-Wno-missing-field-initializers", // ICU-20179
-            ],
         },
     },
 }

libandroidicu/static_shim/Android.bp

diff --git a/libandroidicu/static_shim/Android.bp b/libandroidicu/static_shim/Android.bp
index ade762c..e1730b2 100644
--- a/libandroidicu/static_shim/Android.bp
+++ b/libandroidicu/static_shim/Android.bp
@@ -37,9 +37,6 @@
         },
         windows: {
             enabled: true,
-            cflags: [
-                "-Wno-ignored-attributes", // ICU-20356
-            ],
         },
     },
 }