summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Wong <waiw@codeaurora.org>2016-01-21 18:11:20 -0800
committerAlex Wong <waiw@codeaurora.org>2016-01-28 07:39:10 -0800
commitd9b420698355604a5a9c062b06d1557ffe42e240 (patch)
tree82b69003ad3c68fd893f8b8142b742d79f845f23
parent3d404682e32bfc655e058ab24ebae140e8589147 (diff)
downloadmedia-d9b420698355604a5a9c062b06d1557ffe42e240.tar.gz
libc2dcolorconvert: check if platform support c2d
Compile libc2dcolorconvert library for platform support c2d only. Change-Id: I0677284501efa77065161374044e3a50fd01503b
-rw-r--r--Android.mk3
-rw-r--r--mm-video-v4l2/vidc/venc/Android.mk15
2 files changed, 15 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index ea10828a..ace2fbb4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,10 @@ endif
ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
+
+ifeq ($(BOARD_USES_ADRENO), true)
include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk
+endif
ifeq ($(TARGET_BOARD_PLATFORM),apq8084)
include $(QCOM_MEDIA_ROOT)/videopp/Android.mk
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index e2de55d4..bf188702 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -85,7 +85,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \
- libc2dcolorconvert libdl libgui
+ libdl libgui
+ifeq ($(BOARD_USES_ADRENO), true)
+LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
+endif # ($(BOARD_USES_ADRENO), true)
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
LOCAL_SRC_FILES := src/omx_video_base.cpp
@@ -112,8 +115,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \
- libc2dcolorconvert libdl libgui
+ libdl libgui
LOCAL_SHARED_LIBRARIES += libMpeg4SwEncoder
+ifeq ($(BOARD_USES_ADRENO), true)
+LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
+endif # ($(BOARD_USES_ADRENO), true)
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
LOCAL_SRC_FILES := src/omx_video_base.cpp
@@ -138,8 +144,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \
- libc2dcolorconvert libdl libgui
+ libdl libgui
LOCAL_SHARED_LIBRARIES += libHevcSwEncoder
+ifeq ($(BOARD_USES_ADRENO), true)
+LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
+endif # ($(BOARD_USES_ADRENO), true)
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
LOCAL_SRC_FILES := src/omx_video_base.cpp