diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-04-29 20:05:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-29 20:05:16 +0000 |
| commit | 66903617ecc6534b2781841c16cbd08d49a41d57 (patch) | |
| tree | 886ebb9863784d710e60d4696e18cf01b5e9b503 | |
| parent | b3eb835984b4fed4d4060df80c0d4829de4abd66 (diff) | |
| parent | adb73a7a1b551472b0936ceb14634e6534f0eaf4 (diff) | |
| download | media-oreo-mr1-iot-release.tar.gz | |
Merge "Disable -Wimplicit-fallthrough unless src is fixed."android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release
| -rw-r--r-- | msm8998/libc2dcolorconvert/Android.mk | 2 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/Android.mk | 2 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/Android.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/msm8998/libc2dcolorconvert/Android.mk b/msm8998/libc2dcolorconvert/Android.mk index 4898968..2219de7 100644 --- a/msm8998/libc2dcolorconvert/Android.mk +++ b/msm8998/libc2dcolorconvert/Android.mk @@ -8,7 +8,7 @@ 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_CFLAGS += -Wno-implicit-fallthrough LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/adreno diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk index 4c44fc8..b21840c 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk @@ -134,7 +134,7 @@ 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 +LOCAL_CFLAGS += -Wno-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 4080333..7da6bb7 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk @@ -133,7 +133,7 @@ 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 +LOCAL_CFLAGS += -Wno-implicit-fallthrough include $(BUILD_SHARED_LIBRARY) |