Merge "Use -Werror in external/svox"
diff --git a/pico/compat/jni/Android.mk b/pico/compat/jni/Android.mk
index 9b3ad60..55ebe5e 100755
--- a/pico/compat/jni/Android.mk
+++ b/pico/compat/jni/Android.mk
@@ -20,4 +20,8 @@
liblog \
libdl
+LOCAL_CFLAGS := \
+ -Wall -Werror \
+ -Wno-unused-parameter
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/pico/lib/Android.mk b/pico/lib/Android.mk
index cdf0026..c00932f 100644
--- a/pico/lib/Android.mk
+++ b/pico/lib/Android.mk
@@ -40,6 +40,15 @@
LOCAL_CFLAGS+= $(TOOL_CFLAGS)
LOCAL_LDFLAGS+= $(TOOL_LDFLAGS)
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-error=infinite-recursion \
+ -Wno-parentheses-equality \
+ -Wno-self-assign \
+ -Wno-sign-compare \
+ -Wno-unneeded-internal-declaration \
+ -Wno-unused-parameter \
+
include $(BUILD_STATIC_LIBRARY)
diff --git a/pico/tts/Android.mk b/pico/tts/Android.mk
index 0f0d737..8eb827d 100644
--- a/pico/tts/Android.mk
+++ b/pico/tts/Android.mk
@@ -1,5 +1,11 @@
LOCAL_PATH := $(call my-dir)
+svox_tts_warn_flags := \
+ -Wall -Werror \
+ -Wno-sign-compare \
+ -Wno-unused-const-variable \
+ -Wno-unused-parameter \
+
# Build static library containing all PICO code
# excluding the compatibility code. This is identical
# to the rule below / except that it builds a shared
@@ -9,6 +15,8 @@
LOCAL_MODULE := libttspico_engine
LOCAL_MULTILIB := 32
+LOCAL_CFLAGS := $(svox_tts_warn_flags)
+
LOCAL_SRC_FILES := \
com_svox_picottsengine.cpp \
svox_ssml_parser.cpp
@@ -43,6 +51,8 @@
com_svox_picottsengine.cpp \
svox_ssml_parser.cpp
+LOCAL_CFLAGS := $(svox_tts_warn_flags)
+
LOCAL_C_INCLUDES += \
external/svox/pico/lib \
external/svox/pico/compat/include
@@ -51,3 +61,5 @@
LOCAL_SHARED_LIBRARIES := libcutils libexpat libutils liblog
include $(BUILD_SHARED_LIBRARY)
+
+svox_tts_warn_flags :=
