diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index dfc80c0..40cb407 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -33,7 +33,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmemalloc LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) -LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock +LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock libqdutils LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"memalloc\" LOCAL_SRC_FILES := alloc_controller.cpp ifeq ($(TARGET_USES_ION),true) diff --git a/libqdutils/comptype.h b/libqdutils/comptype.h index a90f957..98588a6 100644 --- a/libqdutils/comptype.h +++ b/libqdutils/comptype.h @@ -33,7 +33,7 @@ #include #include #include - +#include using namespace android; namespace qdutils { // Enum containing the supported composition types @@ -74,11 +74,12 @@ inline QCCompositionType::QCCompositionType() } else if ((strncmp(property, "c2d", 3)) == 0) { mCompositionType = COMPOSITION_TYPE_C2D; } else if ((strncmp(property, "dyn", 3)) == 0) { -#ifdef USE_MDP3 - mCompositionType = COMPOSITION_TYPE_DYN | COMPOSITION_TYPE_MDP; -#else - mCompositionType = COMPOSITION_TYPE_DYN | COMPOSITION_TYPE_C2D; -#endif + if (qdutils::MDPVersion::getInstance().getMDPVersion() < 400) + mCompositionType = + COMPOSITION_TYPE_DYN |COMPOSITION_TYPE_MDP; + else + mCompositionType = + COMPOSITION_TYPE_DYN|COMPOSITION_TYPE_C2D; } else { mCompositionType = COMPOSITION_TYPE_GPU; }