diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-01-05 09:24:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-05 09:24:53 +0000 |
| commit | 5dfaa7ae65e7c69be634b7b842887c29f125b0f6 (patch) | |
| tree | 45e819f6c0cf72996ef9d482ebf38c09a62e5b31 /msm8998 | |
| parent | e62efeefa1d065a4daff842f0bdee799fdc98e97 (diff) | |
| parent | 44b9dee3df99ac660ef71c4d490969564bc37df9 (diff) | |
| download | media-5dfaa7ae65e7c69be634b7b842887c29f125b0f6.tar.gz | |
Merge "Add -Wno-error to compile with global -Werror." am: 3e4f4b4c6c
am: 44b9dee3df
Change-Id: I6e6dca52f539da3232dda8dbf638026ffd52a06f
Diffstat (limited to 'msm8998')
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/Android.mk | 2 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/Android.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk index 5976add..250350e 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk @@ -131,6 +131,8 @@ LOCAL_SRC_FILES += src/hevc_utils.cpp LOCAL_STATIC_LIBRARIES := libOmxVidcCommon LOCAL_SRC_FILES += src/omx_vdec_v4l2.cpp +LOCAL_CFLAGS += -Wno-error + 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 fbd9d78..a66593b 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk @@ -162,6 +162,8 @@ LOCAL_STATIC_LIBRARIES := libOmxVidcCommon LOCAL_SRC_FILES := src/omx_video_base.cpp LOCAL_SRC_FILES += src/omx_swvenc_mpeg4.cpp +LOCAL_CFLAGS += -Wno-error + include $(BUILD_SHARED_LIBRARY) endif |