diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-01-05 09:27:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-05 09:27:25 +0000 |
| commit | e3425756a6a3eb0fc6a41664330c139d34e02c9d (patch) | |
| tree | ef8153a4346b68c2ad5dac06b554ecd1650dbb10 /msm8998 | |
| parent | 1faf07c8859eb92136e5bdfb3afd68186c084c6d (diff) | |
| parent | 5dfaa7ae65e7c69be634b7b842887c29f125b0f6 (diff) | |
| download | media-e3425756a6a3eb0fc6a41664330c139d34e02c9d.tar.gz | |
Merge "Add -Wno-error to compile with global -Werror." am: 3e4f4b4c6c am: 44b9dee3df
am: 5dfaa7ae65
Change-Id: I51d7b311535604491e9a9f8867b06bd963898fac
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 |