From aee42699357e46d106ac5a7ed88a0de60be348fc Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Tue, 15 Jan 2019 19:35:54 +0000 Subject: Enable libicui18n and libandroidicu for Windows This is needed to use skia in Android Studio for Windows. The Windows build requires two compilation flags to ignore several compilation warnings. Those will be able to be removed once fixes have been merged upstream. Bug: 122841746 Test: sdk build Change-Id: I094b8001689b208e64284adb51c50f566b03e097 --- libandroidicu/Android.bp | 7 +++++-- libandroidicu/static_shim/Android.bp | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'libandroidicu') diff --git a/libandroidicu/Android.bp b/libandroidicu/Android.bp index 5534dbebd..aa531f2f1 100644 --- a/libandroidicu/Android.bp +++ b/libandroidicu/Android.bp @@ -54,8 +54,11 @@ cc_library { cflags: [ "-DANDROID_LINK_SHARED_ICU4C", ], - } - } + }, + windows: { + enabled: true, + }, + }, } // TODO: http://b/120776993 Testing for libandroidicu diff --git a/libandroidicu/static_shim/Android.bp b/libandroidicu/static_shim/Android.bp index fa3b97ab3..a68252465 100644 --- a/libandroidicu/static_shim/Android.bp +++ b/libandroidicu/static_shim/Android.bp @@ -34,6 +34,12 @@ cc_library_static { "-DANDROID_LINK_SHARED_ICU4C", ], }, + windows: { + enabled: true, + cflags: [ + "-Wno-ignored-attributes", // ICU-20356 + ], + }, }, } -- cgit v1.2.3