drm_hwcomposer: Wrap the importers in a class
This will allow us to move the importer functionality into the
drmcompositor.
Change-Id: I4274ebd1776c4d7879342c54a2b7c4095ebc50f4
Signed-off-by: Sean Paul <seanpaul@chromium.org>
diff --git a/Android.mk b/Android.mk
index 81e7e48..30dfb5f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,7 @@
libutils \
LOCAL_C_INCLUDES := \
+ external/drm_gralloc \
external/libdrm \
external/libdrm/include/drm \
system/core/include/utils \
@@ -38,19 +39,18 @@
drmconnector.cpp \
drmcrtc.cpp \
drmencoder.cpp \
+ drmgenericimporter.cpp \
drmmode.cpp \
drmplane.cpp \
drmproperty.cpp \
hwcomposer.cpp \
+ nvimporter.cpp \
worker.cpp
-ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),drm-gralloc)
-LOCAL_C_INCLUDES += external/drm_gralloc
-LOCAL_SRC_FILES += hwcomposer_import_drm_gralloc.cpp
-endif
ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),nvidia-gralloc)
-LOCAL_C_INCLUDES += external/drm_gralloc
-LOCAL_SRC_FILES += hwcomposer_import_nv_gralloc.cpp
+LOCAL_CPPFLAGS += -DUSE_NVIDIA_IMPORTER
+else
+LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER
endif
LOCAL_MODULE := hwcomposer.drm