diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:38:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 22:38:32 +0000 |
| commit | f5f24006f7bd997c6bca00804ec0f35bddd7ccc2 (patch) | |
| tree | 0b7338350bbe3e69c24a9d37b81166ad958d6de9 /media | |
| parent | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (diff) | |
| parent | cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed (diff) | |
| download | frameworks_av-f5f24006f7bd997c6bca00804ec0f35bddd7ccc2.zip frameworks_av-f5f24006f7bd997c6bca00804ec0f35bddd7ccc2.tar.gz frameworks_av-f5f24006f7bd997c6bca00804ec0f35bddd7ccc2.tar.bz2 | |
am cd4eb72e: Merge "media: -Werror re-enabled"
* commit 'cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed':
media: -Werror re-enabled
Diffstat (limited to 'media')
| -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 \ |