summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2016-09-03 14:01:23 +0300
committerMichael Bestas <mikeioannina@gmail.com>2016-09-05 22:05:28 +0300
commitbc19aa6f84f8893050076f8f0d6a7efad67dff6b (patch)
tree158f11b503ea75a0244321ef1cf92eb592544b5e
parentc76973b69d5a1b45129c4caffdfb225023e7e77e (diff)
downloadandroid_hardware_qcom_media-cm-14.0-caf-8916.tar.gz
android_hardware_qcom_media-cm-14.0-caf-8916.tar.bz2
android_hardware_qcom_media-cm-14.0-caf-8916.zip
Revert "mm-video: Disable CLANG"cm-14.0-caf-8916
* We can build mm-video with clang in CM This reverts commit 904d0a1d86382073255733e6d53d4d0c9df14525.
-rw-r--r--mm-video-v4l2/vidc/test/Android.mk1
-rw-r--r--mm-video-v4l2/vidc/vdec/Android.mk1
-rw-r--r--mm-video-v4l2/vidc/venc/Android.mk4
3 files changed, 1 insertions, 5 deletions
diff --git a/mm-video-v4l2/vidc/test/Android.mk b/mm-video-v4l2/vidc/test/Android.mk
index 189a41be..57e13e78 100644
--- a/mm-video-v4l2/vidc/test/Android.mk
+++ b/mm-video-v4l2/vidc/test/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := msm-vidc-test
-LOCAL_CLANG := false
LOCAL_PRELINK_MODULE := false
LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 1f973eeb..77506f95 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -94,7 +94,6 @@ endif
include $(CLEAR_VARS)
LOCAL_MODULE := libOmxVdec
-LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libmm-vdec-def) -Werror
LOCAL_C_INCLUDES += $(libmm-vdec-inc)
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 285d9792..f7027e5a 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -81,7 +81,6 @@ libmm-venc-add-dep := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
include $(CLEAR_VARS)
LOCAL_MODULE := libOmxVenc
-LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_C_INCLUDES := $(libmm-venc-inc)
@@ -109,7 +108,7 @@ include $(CLEAR_VARS)
libmm-venc-inc += $(TARGET_OUT_HEADERS)/mm-video/swvenc
LOCAL_MODULE := libOmxSwVencMpeg4
-LOCAL_CLANG := false
+
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_C_INCLUDES := $(libmm-venc-inc)
@@ -137,7 +136,6 @@ include $(CLEAR_VARS)
libmm-venc-inc += $(TARGET_OUT_HEADERS)/mm-video/swVenc
LOCAL_MODULE := libOmxSwVencHevc
-LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_C_INCLUDES := $(libmm-venc-inc)