commit b85f3aa15d78849fd25939d052b842d043ce3c99
author Dmitriy Ivanov <dimitry@google.com> Sun Mar 08 00:16:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Mar 08 00:16:36 2015 +0000
tree 854d75fe41c1ff2a2278b55fcba84542aae0c027
parent f7f03e6f6b071848b9d3a6b7bd534a1719735c36
parent 1d1ef3432782518673432280028fe6a4231d4dca

am 11cd49d2: am 6821d0b6: am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"

* commit '11cd49d284464e7fb972e0475e7a71281ba53212':
  Fix build: Remove -Wold-style-cast

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 3937449..027ad16 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -25,7 +25,6 @@
 LOCAL_SHARED_LIBRARIES := libutils
 LOCAL_MODULE:= libziparchive
 LOCAL_CFLAGS := -Werror -Wall
-LOCAL_CPPFLAGS := -Wold-style-cast
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)