commit 9c5b7030bc93c9b73490b7eec1212bb65d6fd22a
author Pirama Arumuga Nainar <pirama@google.com> Thu Oct 11 10:25:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 11 10:25:42 2018 -0700
tree ad417f249ba35c0c0a0f7c55566dc76c938d0de8
parent b4aab99a0216f818d086c2c9bf1009cba979635a
parent e57bb00499909a97fa7f37b43af5647925210bad

Merge changes from topic "windows-libcxx"
am: a2ccce870c

Change-Id: I7c0082c9e7e7d9ffa2fa990d029217c261512d93

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 {