summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2015-06-01 14:11:52 -0400
committerSean Paul <seanpaul@chromium.org>2015-06-04 12:09:29 -0400
commitda6270d4882eb0463717405bcadab3ac8fe902ea (patch)
tree2fbefc466c871a0e6a3802c18a0a181056fa59a9 /Android.mk
parent235c5e7e6f2e41fa788868c84bf982ac1a3ac4e8 (diff)
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>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 81e7e48..30dfb5f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,7 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
LOCAL_C_INCLUDES := \
+ external/drm_gralloc \
external/libdrm \
external/libdrm/include/drm \
system/core/include/utils \
@@ -38,19 +39,18 @@ LOCAL_SRC_FILES := \
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