diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2017-12-25 00:47:05 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2018-01-02 13:45:35 -0800 |
| commit | 97f0e3052751494815743ddb7e499af57dd96ab0 (patch) | |
| tree | c646c35de104c7c58521d6610bb4556414c67a52 /msm8974 | |
| parent | 4690cb2b6ae92fbbdebe8c552f42ddafdc354130 (diff) | |
| download | media-97f0e3052751494815743ddb7e499af57dd96ab0.tar.gz | |
Add -Wno-error to compile with global -Werror.
Bug: 66996870
Test: normal builds.
Change-Id: Ie9d18e6ea8db12b0ccde25f2718d0ef83fe4ba3a
Diffstat (limited to 'msm8974')
| -rw-r--r-- | msm8974/libc2dcolorconvert/Android.mk | 2 | ||||
| -rw-r--r-- | msm8974/mm-core/Android.mk | 1 | ||||
| -rw-r--r-- | msm8974/mm-core/omxcore/Android.mk | 1 | ||||
| -rw-r--r-- | msm8974/mm-video-legacy/vidc/vdec.mk | 2 | ||||
| -rw-r--r-- | msm8974/mm-video-legacy/vidc/venc.mk | 2 | ||||
| -rw-r--r-- | msm8974/mm-video-v4l2/vidc/vdec.mk | 4 | ||||
| -rw-r--r-- | msm8974/mm-video-v4l2/vidc/venc.mk | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/msm8974/libc2dcolorconvert/Android.mk b/msm8974/libc2dcolorconvert/Android.mk index 4edb0a5..e055c04 100644 --- a/msm8974/libc2dcolorconvert/Android.mk +++ b/msm8974/libc2dcolorconvert/Android.mk @@ -5,6 +5,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ C2DColorConverter.cpp +LOCAL_CFLAGS += -Wno-error + LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/qcom/display diff --git a/msm8974/mm-core/Android.mk b/msm8974/mm-core/Android.mk index 2e2955c..e2727f5 100644 --- a/msm8974/mm-core/Android.mk +++ b/msm8974/mm-core/Android.mk @@ -7,6 +7,7 @@ OMXCORE_CFLAGS := -g -O3 -DVERBOSE OMXCORE_CFLAGS += -O0 -fno-inline -fno-short-enums OMXCORE_CFLAGS += -D_ANDROID_ OMXCORE_CFLAGS += -U_ENABLE_QC_MSG_LOG_ +OMXCORE_CFLAGS += -Wno-error #=============================================================================== # Figure out the targets diff --git a/msm8974/mm-core/omxcore/Android.mk b/msm8974/mm-core/omxcore/Android.mk index 19cee6d..2e9719d 100644 --- a/msm8974/mm-core/omxcore/Android.mk +++ b/msm8974/mm-core/omxcore/Android.mk @@ -30,6 +30,7 @@ include $(CLEAR_VARS) OMXCORE_CFLAGS += -D_ANDROID_ OMXCORE_CFLAGS += -D_ENABLE_QC_MSG_LOG_ +OMXCORE_CFLAGS += -Wno-error ifeq ($(TARGET_BOARD_PLATFORM),msm7x30) MM_CORE_TARGET = 7630 diff --git a/msm8974/mm-video-legacy/vidc/vdec.mk b/msm8974/mm-video-legacy/vidc/vdec.mk index 798eacf..b8ce48b 100644 --- a/msm8974/mm-video-legacy/vidc/vdec.mk +++ b/msm8974/mm-video-legacy/vidc/vdec.mk @@ -83,6 +83,8 @@ LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp LOCAL_SRC_FILES += common/src/extra_data_handler.cpp LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp +LOCAL_CFLAGS += -Wno-error + include $(BUILD_SHARED_LIBRARY) # --------------------------------------------------------------------------------- diff --git a/msm8974/mm-video-legacy/vidc/venc.mk b/msm8974/mm-video-legacy/vidc/venc.mk index 75e59a1..5285ed6 100644 --- a/msm8974/mm-video-legacy/vidc/venc.mk +++ b/msm8974/mm-video-legacy/vidc/venc.mk @@ -73,6 +73,8 @@ endif LOCAL_SRC_FILES += common/src/extra_data_handler.cpp +LOCAL_CFLAGS += -Wno-error + include $(BUILD_SHARED_LIBRARY) # ----------------------------------------------------------------------------- diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk index 7338d47..c53cc7a 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec.mk +++ b/msm8974/mm-video-v4l2/vidc/vdec.mk @@ -139,6 +139,8 @@ LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp # omx_vdec_msm8974.cpp:9375:16: address of array 'extra->data' will always evaluate to 'true' LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion +LOCAL_CFLAGS += -Wno-error + include $(BUILD_SHARED_LIBRARY) @@ -172,6 +174,8 @@ LOCAL_SRC_FILES += vdec/src/hevc_utils.cpp LOCAL_SRC_FILES += common/src/extra_data_handler.cpp LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp +LOCAL_CFLAGS += -Wno-error + #include $(BUILD_SHARED_LIBRARY) endif diff --git a/msm8974/mm-video-v4l2/vidc/venc.mk b/msm8974/mm-video-v4l2/vidc/venc.mk index f019bc2..65cce9d 100644 --- a/msm8974/mm-video-v4l2/vidc/venc.mk +++ b/msm8974/mm-video-v4l2/vidc/venc.mk @@ -106,6 +106,8 @@ endif LOCAL_SRC_FILES += common/src/extra_data_handler.cpp +LOCAL_CFLAGS += -Wno-error + include $(BUILD_SHARED_LIBRARY) endif #BUILD_TINY_ANDROID |