diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2019-01-15 19:35:54 +0000 |
|---|---|---|
| committer | Jerome Gaillard <jgaillard@google.com> | 2019-01-15 19:35:54 +0000 |
| commit | aee42699357e46d106ac5a7ed88a0de60be348fc (patch) | |
| tree | 2926b9ade59f3b6d16c26a0c3e51cc69bfa044a8 /libandroidicu | |
| parent | d05eb81478a4836354e045ecdb381cd6960e84c7 (diff) | |
| download | android_external_icu-aee42699357e46d106ac5a7ed88a0de60be348fc.tar.gz android_external_icu-aee42699357e46d106ac5a7ed88a0de60be348fc.tar.bz2 android_external_icu-aee42699357e46d106ac5a7ed88a0de60be348fc.zip | |
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
Diffstat (limited to 'libandroidicu')
| -rw-r--r-- | libandroidicu/Android.bp | 7 | ||||
| -rw-r--r-- | libandroidicu/static_shim/Android.bp | 6 |
2 files changed, 11 insertions, 2 deletions
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 + ], + }, }, } |