commit ce65a05eddc8a39d9805d1e1eee0292725df1f1c
author Mark Salyzyn <salyzyn@google.com> Tue Apr 15 23:37:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 15 23:37:20 2014 +0000
tree 90485f0b968412906326e1248a5da0d6e025a003
parent 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d
parent f5f24006f7bd997c6bca00804ec0f35bddd7ccc2

am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"

* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
  media: -Werror re-enabled

media/libstagefright/matroska/Android.mk

diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk
index 2d8c1e1..446ff8c 100644
--- a/media/libstagefright/matroska/Android.mk
+++ b/media/libstagefright/matroska/Android.mk
@@ -8,7 +8,7 @@
         $(TOP)/external/libvpx/libwebm \
         $(TOP)/frameworks/native/include/media/openmax \
 
-LOCAL_CFLAGS += -Wno-multichar
+LOCAL_CFLAGS += -Wno-multichar -Werror
 
 LOCAL_MODULE:= libstagefright_matroska
 

media/libstagefright/timedtext/Android.mk

diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk
index c4cfa17..6a8b9fc 100644
--- a/media/libstagefright/timedtext/Android.mk
+++ b/media/libstagefright/timedtext/Android.mk
@@ -9,7 +9,7 @@
         TimedTextSRTSource.cpp    \
         TimedTextPlayer.cpp
 
-LOCAL_CFLAGS += -Wno-multichar
+LOCAL_CFLAGS += -Wno-multichar -Werror
 
 LOCAL_C_INCLUDES:= \
         $(TOP)/frameworks/av/include/media/stagefright/timedtext \