summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-01-05 09:15:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-01-05 09:15:47 +0000
commit3e4f4b4c6cc2db6c0479063d139b2f78c2e6d50a (patch)
treec646c35de104c7c58521d6610bb4556414c67a52
parent4690cb2b6ae92fbbdebe8c552f42ddafdc354130 (diff)
parent97f0e3052751494815743ddb7e499af57dd96ab0 (diff)
downloadmedia-o-mr1-iot-preview-8.tar.gz
Merge "Add -Wno-error to compile with global -Werror."android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
Diffstat
-rw-r--r--msm8974/libc2dcolorconvert/Android.mk2
-rw-r--r--msm8974/mm-core/Android.mk1
-rw-r--r--msm8974/mm-core/omxcore/Android.mk1
-rw-r--r--msm8974/mm-video-legacy/vidc/vdec.mk2
-rw-r--r--msm8974/mm-video-legacy/vidc/venc.mk2
-rw-r--r--msm8974/mm-video-v4l2/vidc/vdec.mk4
-rw-r--r--msm8974/mm-video-v4l2/vidc/venc.mk2
-rw-r--r--msm8996/libc2dcolorconvert/Android.mk2
-rw-r--r--msm8996/mm-core/Android.mk1
-rw-r--r--msm8996/mm-video-v4l2/vidc/vdec/Android.mk4
-rw-r--r--msm8998/mm-video-v4l2/vidc/vdec/Android.mk2
-rw-r--r--msm8998/mm-video-v4l2/vidc/venc/Android.mk2
12 files changed, 25 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
diff --git a/msm8996/libc2dcolorconvert/Android.mk b/msm8996/libc2dcolorconvert/Android.mk
index 1871864..ec30280 100644
--- a/msm8996/libc2dcolorconvert/Android.mk
+++ b/msm8996/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/msm8996/mm-core/Android.mk b/msm8996/mm-core/Android.mk
index bd1f7d8..14594d4 100644
--- a/msm8996/mm-core/Android.mk
+++ b/msm8996/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/msm8996/mm-video-v4l2/vidc/vdec/Android.mk b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
index 4ee8802..12ad685 100644
--- a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
@@ -127,6 +127,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)
@@ -169,6 +171,8 @@ LOCAL_SRC_FILES += src/hevc_utils.cpp
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
endif
endif
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 23:53:27 +0000