Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce65a05e authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

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

* commit 'f5f24006':
  media: -Werror re-enabled
parents 1b24cf32 f5f24006

media/libstagefright/matroska/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

media/libstagefright/timedtext/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \