diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 23:37:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 23:37:20 +0000 |
| commit | ce65a05eddc8a39d9805d1e1eee0292725df1f1c (patch) | |
| tree | 90485f0b968412906326e1248a5da0d6e025a003 /media/libstagefright/matroska | |
| parent | 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (diff) | |
| parent | f5f24006f7bd997c6bca00804ec0f35bddd7ccc2 (diff) | |
| download | frameworks_av-ce65a05eddc8a39d9805d1e1eee0292725df1f1c.zip frameworks_av-ce65a05eddc8a39d9805d1e1eee0292725df1f1c.tar.gz frameworks_av-ce65a05eddc8a39d9805d1e1eee0292725df1f1c.tar.bz2 | |
am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"
* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
media: -Werror re-enabled
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 |
1 files changed, 1 insertions, 1 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 |