diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:31:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-15 22:31:39 +0000 |
| commit | cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed (patch) | |
| tree | 32191d574c9a8ba8e66398ab375be118c37b3e86 | |
| parent | 839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (diff) | |
| parent | 3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0 (diff) | |
| download | frameworks_av-cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed.zip frameworks_av-cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed.tar.gz frameworks_av-cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed.tar.bz2 | |
Merge "media: -Werror re-enabled"
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ LOCAL_C_INCLUDES:= \ $(TOP)/external/libvpx/libwebm \ $(TOP)/frameworks/native/include/media/openmax \ -LOCAL_CFLAGS += -Wno-multichar +LOCAL_CFLAGS += -Wno-multichar -Werror LOCAL_MODULE:= libstagefright_matroska 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 @@ LOCAL_SRC_FILES:= \ TimedTextSRTSource.cpp \ TimedTextPlayer.cpp -LOCAL_CFLAGS += -Wno-multichar +LOCAL_CFLAGS += -Wno-multichar -Werror LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ |