commit 45993ad8833063a50af83f76ec1ddeba673b5277
author Glenn Kasten <gkasten@google.com> Mon Mar 28 22:36:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 28 22:36:59 2016 +0000
tree 5dd53fffc90cb1218c67cd117b6c718d49c0a444
parent 2c96c0e35c7600c1112baa2cbebdf52f477c8880
parent 984b4f2db2f5969afff6420739f6d785f4a14bf3

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

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 1738df8..2cec5d2 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -5,7 +5,6 @@
 LOCAL_SRC_FILES := register.cpp
 LOCAL_MODULE := libregistermsext
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -40,6 +39,4 @@
 
 LOCAL_INIT_RC := mediaserver.rc
 
-LOCAL_CFLAGS := -Werror -Wall
-
 include $(BUILD_EXECUTABLE)

radio/Android.mk

diff --git a/radio/Android.mk b/radio/Android.mk
index 0377328..ecbb8fd 100644
--- a/radio/Android.mk
+++ b/radio/Android.mk
@@ -36,6 +36,4 @@
 
 LOCAL_MODULE:= libradio
 
-LOCAL_CFLAGS := -Werror -Wall
-
 include $(BUILD_SHARED_LIBRARY)

soundtrigger/Android.mk

diff --git a/soundtrigger/Android.mk b/soundtrigger/Android.mk
index c794cc1..d91c4c2 100644
--- a/soundtrigger/Android.mk
+++ b/soundtrigger/Android.mk
@@ -35,6 +35,4 @@
 
 LOCAL_MODULE:= libsoundtrigger
 
-LOCAL_CFLAGS := -Werror -Wall
-
 include $(BUILD_SHARED_LIBRARY)

tools/resampler_tools/Android.mk

diff --git a/tools/resampler_tools/Android.mk b/tools/resampler_tools/Android.mk
index bba5199..b58e4cd 100644
--- a/tools/resampler_tools/Android.mk
+++ b/tools/resampler_tools/Android.mk
@@ -12,6 +12,6 @@
 
 LOCAL_MODULE := fir
 
-LOCAL_CFLAGS := -Werror -Wall
-
 include $(BUILD_HOST_EXECUTABLE)
+
+