Merge "Add -Wno-error to compile with global -Werror."
diff --git a/Android.mk b/Android.mk
index d69d983..217c528 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@
 LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/common/inc
 
 LOCAL_CFLAGS := $(keymaster-def)
+LOCAL_CFLAGS += -Wno-error
 
 LOCAL_SHARED_LIBRARIES := \
         libcrypto \