diff options
| author | Chih-hung Hsieh <chh@google.com> | 2018-10-19 13:58:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-19 13:58:30 -0700 |
| commit | 8655f940c04e503948164783fa220cd74eee2e29 (patch) | |
| tree | cc5506eb358cc6809d43edd2715c0c3e92e622b9 /msm8998 | |
| parent | 56096a1aa4507d028a93d75182af4d1761f82d66 (diff) | |
| parent | 6954d4ec8a55bc6c0ab5256459e2276518a53bb7 (diff) | |
| download | media-8655f940c04e503948164783fa220cd74eee2e29.tar.gz | |
Merge "Allow implicit-fallthrough warnings locally."
am: 6954d4ec8a
Change-Id: Ia5c3dca5a82e1a418bb703e81569646014fca51d
Diffstat (limited to 'msm8998')
| -rw-r--r-- | msm8998/libc2dcolorconvert/Android.mk | 3 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/Android.mk | 3 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/Android.mk | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/msm8998/libc2dcolorconvert/Android.mk b/msm8998/libc2dcolorconvert/Android.mk index 8c767ba..4898968 100644 --- a/msm8998/libc2dcolorconvert/Android.mk +++ b/msm8998/libc2dcolorconvert/Android.mk @@ -7,6 +7,9 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := -Wall -Werror +# Allow implicit fallthrough in C2DColorConverter.cpp:554 until it is fixed. +LOCAL_CFLAGS += -Wno-error=implicit-fallthrough + LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/adreno LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/qcom/display diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk index 250350e..4c44fc8 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk @@ -133,6 +133,9 @@ LOCAL_SRC_FILES += src/omx_vdec_v4l2.cpp LOCAL_CFLAGS += -Wno-error +# Allow implicit fallthrough in omx_vdec_v4l2.cpp:5409 until it is fixed. +LOCAL_CFLAGS += -Wno-error=implicit-fallthrough + include $(BUILD_SHARED_LIBRARY) diff --git a/msm8998/mm-video-v4l2/vidc/venc/Android.mk b/msm8998/mm-video-v4l2/vidc/venc/Android.mk index a66593b..4080333 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk @@ -132,6 +132,9 @@ LOCAL_SRC_FILES := src/omx_video_base.cpp LOCAL_SRC_FILES += src/omx_video_encoder.cpp LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp +# Allow implicit fallthrough in omx_video_encoder.cpp:2322 until it is fixed. +LOCAL_CFLAGS += -Wno-error=implicit-fallthrough + include $(BUILD_SHARED_LIBRARY) ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true) |