Merge "Make build warnings be errors" into nyc-dev

7 files changed, 22 insertions, 7 deletions

diff --git a/alsa_utils/Android.mk b/alsa_utils/Android.mk
index 4b84a937..9b7f5dd3 100644
--- a/alsa_utils/Android.mk
+++ b/alsa_utils/Android.mk
@@ -27,7 +27,8 @@ LOCAL_C_INCLUDES += \
 LOCAL_EXPORT_C_INCLUDE_DIRS := system/media/alsa_utils/include
 LOCAL_SHARED_LIBRARIES := liblog libcutils libtinyalsa libaudioutils
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -Wno-unused-parameter
+LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -Wno-unused-parameter
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/audio_route/Android.mk b/audio_route/Android.mk
index 2fcdc943..c32b88db 100644
--- a/audio_route/Android.mk
+++ b/audio_route/Android.mk
@@ -8,4 +8,5 @@ LOCAL_SRC_FILES:= audio_route.c
 LOCAL_MODULE := libaudioroute
 LOCAL_SHARED_LIBRARIES:= liblog libcutils libutils libexpat libtinyalsa
 LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_utils/Android.mk b/audio_utils/Android.mk
index 63fc8602..e3b63f57 100644
--- a/audio_utils/Android.mk
+++ b/audio_utils/Android.mk
@@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := \
 	liblog \
 	libspeexresampler
 
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -43,7 +44,8 @@ LOCAL_SRC_FILES := \
 	roundup.c
 LOCAL_C_INCLUDES += \
 	$(call include-path-for, audio-utils)
-LOCAL_CFLAGS := -D__unused=
+LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -D__unused='__attribute__((unused))'
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -57,7 +59,8 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES += \
 	$(call include-path-for, audio-utils)
 
-LOCAL_CFLAGS := -UHAVE_STDERR
+LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -UHAVE_STDERR
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -74,6 +77,8 @@ LOCAL_C_INCLUDES += \
 
 #LOCAL_SHARED_LIBRARIES := libaudioutils
 
+LOCAL_CFLAGS := -Werror -Wall
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -89,6 +94,8 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES += \
 	$(call include-path-for, audio-utils)
 
+LOCAL_CFLAGS := -Werror -Wall
+
 include $(BUILD_STATIC_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/audio_utils/spdif/Android.mk b/audio_utils/spdif/Android.mk
index 39c2fa27..b218bd36 100644
--- a/audio_utils/spdif/Android.mk
+++ b/audio_utils/spdif/Android.mk
@@ -18,4 +18,5 @@ LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	liblog
 
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_utils/tests/Android.mk b/audio_utils/tests/Android.mk
index 446b6144..0db09dc3 100644
--- a/audio_utils/tests/Android.mk
+++ b/audio_utils/tests/Android.mk
@@ -17,6 +17,7 @@ LOCAL_SRC_FILES := \
 LOCAL_MODULE := primitives_tests
 LOCAL_MODULE_TAGS := tests
 
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_NATIVE_TEST)
 
 include $(CLEAR_VARS)
@@ -26,6 +27,7 @@ LOCAL_C_INCLUDES := $(call include-path-for, audio-utils)
 LOCAL_SHARED_LIBRARIES := libaudioutils
 # libmedia libbinder libcutils libutils
 LOCAL_STATIC_LIBRARIES := libsndfile
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -34,6 +36,7 @@ LOCAL_MODULE := fifo_tests
 LOCAL_C_INCLUDES := $(call include-path-for, audio-utils)
 # libmedia libbinder libcutils libutils
 LOCAL_STATIC_LIBRARIES := libsndfile libaudioutils liblog
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -41,4 +44,5 @@ LOCAL_SRC_FILES := limiter_tests.c
 LOCAL_MODULE := limiter_tests
 LOCAL_C_INCLUDES := $(call include-path-for, audio-utils)
 LOCAL_STATIC_LIBRARIES := libaudioutils
+LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/brillo/audio/audioservice/Android.mk b/brillo/audio/audioservice/Android.mk
index 2ebf3335..8d4fb15e 100644
--- a/brillo/audio/audioservice/Android.mk
+++ b/brillo/audio/audioservice/Android.mk
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := \
   audio_device_handler.cpp \
   main_audio_service.cpp
 LOCAL_SHARED_LIBRARIES := $(audio_service_shared_libraries)
-LOCAL_CFLAGS := -Wall
+LOCAL_CFLAGS := -Werror -Wall
 LOCAL_INIT_RC := brilloaudioserv.rc
 include $(BUILD_EXECUTABLE)
 
@@ -49,5 +49,6 @@ LOCAL_STATIC_LIBRARIES := \
   libBionicGtestMain \
   libchrome_test_helpers \
   libgmock
-LOCAL_CFLAGS := -Wno-sign-compare -Wall
+LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -Wno-sign-compare
 include $(BUILD_NATIVE_TEST)
diff --git a/radio/src/Android.mk b/radio/src/Android.mk
index b96a40a3..01787ec6 100644
--- a/radio/src/Android.mk
+++ b/radio/src/Android.mk
@@ -16,8 +16,8 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_MODULE := libradio_metadata
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CFLAGS += \
-	-fvisibility=hidden
+LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -fvisibility=hidden
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include