commit fb7c4de61284cc300b71819e43314707f8e2d7d1
author Pirama Arumuga Nainar <pirama@google.com> Thu Oct 11 11:10:19 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 11 11:10:19 2018 -0700
tree 409cc87b1bb656b3aad12427f3cdc5d84046f994
parent e4ff257bfcf60944aeeb346e8830210cb10af37a
parent cf42ab4ae878402a0c11df6dc1ee2ff7598e35e4

Merge changes from topic "windows-libcxx" am: a2ccce870c am: 9c9d8bb965
am: cf42ab4ae8

Change-Id: I87868a6c2d0c59c47235c2317d1133afbdedba55

libziparchive/Android.bp

diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index fd3f602..3308adf 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -23,11 +23,21 @@
         "-D_FILE_OFFSET_BITS=64",
     ],
     cppflags: [
-        "-Wold-style-cast",
         // Incorrectly warns when C++11 empty brace {} initializer is used.
         // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61489
         "-Wno-missing-field-initializers",
     ],
+
+    // Enable -Wold-style-cast only for non-Windows targets.  _islower_l,
+    // _isupper_l etc. in MinGW locale_win32.h (included from
+    // libcxx/include/__locale) has an old-style-cast.
+    target: {
+        not_windows: {
+            cppflags: [
+                "-Wold-style-cast",
+            ],
+        },
+    },
 }
 
 cc_defaults {