diff --git a/uncrypt/Android.mk b/uncrypt/Android.mk
index 09cfdfc..3613799 100644
--- a/uncrypt/Android.mk
+++ b/uncrypt/Android.mk
@@ -19,23 +19,24 @@
 LOCAL_SRC_FILES := bootloader_message_writer.cpp
 LOCAL_MODULE := libbootloader_message_writer
 LOCAL_STATIC_LIBRARIES := libbase libfs_mgr
+LOCAL_CFLAGS := -Werror
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
 LOCAL_CLANG := true
-
 LOCAL_SRC_FILES := uncrypt.cpp
-
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-
 LOCAL_MODULE := uncrypt
-
-LOCAL_STATIC_LIBRARIES := libbootloader_message_writer libbase \
-                          liblog libfs_mgr libcutils \
-
+LOCAL_STATIC_LIBRARIES := libbootloader_message_writer \
+                          libbase \
+                          liblog \
+                          libfs_mgr \
+                          libcutils
+LOCAL_CFLAGS := -Werror
 LOCAL_INIT_RC := uncrypt.rc
 
 include $(BUILD_EXECUTABLE)