Merge "wear_ui: Remove backgroundIcon."
diff --git a/edify/Android.mk b/edify/Android.mk
index ffd54c2..baf4dd2 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -28,7 +28,7 @@
     $(edify_src_files) \
     edify_parser.cpp
 
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := -Wall -Werror
 LOCAL_CPPFLAGS := -g -O0
 LOCAL_MODULE := edify_parser
 LOCAL_YACCFLAGS := -v
@@ -46,7 +46,7 @@
 
 LOCAL_SRC_FILES := $(edify_src_files)
 
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := -Wall -Werror
 LOCAL_CPPFLAGS := -Wno-unused-parameter
 LOCAL_CPPFLAGS += -Wno-deprecated-register
 LOCAL_MODULE := libedify
diff --git a/edify/lexer.ll b/edify/lexer.ll
index b764d16..cb45943 100644
--- a/edify/lexer.ll
+++ b/edify/lexer.ll
@@ -35,6 +35,8 @@
 
 %x STR
 
+%option noinput
+%option nounput
 %option noyywrap
 
 %%