Merge "Use -Werror in external/fsck_msdos" am: b212f4da73 am: b901fc09c3 am: 7bbbf06341
am: 187d924304

Change-Id: Id36ff02f5161ae67674008e2faa7c4ec22ca8f2c
diff --git a/Android.mk b/Android.mk
index 534a478..8dec83a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,9 +6,15 @@
 
 LOCAL_C_INCLUDES := external/fsck_msdos/
 
-LOCAL_CFLAGS := -O2 -g -W -Wall -D_BSD_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-LOCAL_CFLAGS := -Wno-unused-variable -Wno-unused-const-variable -Wno-format -Wno-sign-compare
+LOCAL_CFLAGS := -O2 -g \
+    -Wall -Werror \
+    -D_BSD_SOURCE \
+    -D_LARGEFILE_SOURCE \
+    -D_FILE_OFFSET_BITS=64 \
+    -Wno-unused-variable \
+    -Wno-unused-const-variable \
+    -Wno-format \
+    -Wno-sign-compare
 
 LOCAL_MODULE := fsck_msdos
 LOCAL_MODULE_TAGS :=