drm_hwcomposer: Add sanity check on display in SetLayers

[android-x86/external-drm_hwcomposer.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 58bf1ef..810caac 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -17,16 +17,17 @@ ifeq ($(strip $(BOARD_USES_DRM_HWCOMPOSER)),true)
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-# TODO: We should specify this in device.mk
-BUFFER_IMPORTER := nvidia-gralloc
-
 LOCAL_SHARED_LIBRARIES := \
        libcutils \
        libdrm \
+       libEGL \
+       libGLESv2 \
        libhardware \
        liblog \
        libsync \
-       libutils \
+       libui \
+       libutils
+
 
 LOCAL_C_INCLUDES := \
        external/libdrm \
@@ -36,24 +37,32 @@ LOCAL_C_INCLUDES := \
        system/core/libsync/include \
 
 LOCAL_SRC_FILES := \
-       compositor.cpp \
        drmresources.cpp \
+        drmcomposition.cpp \
+        drmcompositor.cpp \
+        drmcompositorworker.cpp \
        drmconnector.cpp \
        drmcrtc.cpp \
+        drmdisplaycomposition.cpp \
+        drmdisplaycompositor.cpp \
        drmencoder.cpp \
        drmmode.cpp \
        drmplane.cpp \
        drmproperty.cpp \
+       glworker.cpp \
        hwcomposer.cpp \
+       seperate_rects.cpp \
+       virtualcompositorworker.cpp \
+       vsyncworker.cpp \
        worker.cpp
 
-ifeq ($(strip $(BUFFER_IMPORTER)),drm-gralloc)
-LOCAL_C_INCLUDES += external/drm_gralloc
-LOCAL_SRC_FILES += hwcomposer_import_drm_gralloc.cpp
-endif
-ifeq ($(strip $(BUFFER_IMPORTER)),nvidia-gralloc)
+ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),nvidia-gralloc)
+LOCAL_SRC_FILES += nvimporter.cpp
+LOCAL_CPPFLAGS += -DUSE_NVIDIA_IMPORTER
+else
 LOCAL_C_INCLUDES += external/drm_gralloc
-LOCAL_SRC_FILES += hwcomposer_import_nv_gralloc.cpp
+LOCAL_SRC_FILES += drmgenericimporter.cpp
+LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER
 endif
 
 LOCAL_MODULE := hwcomposer.drm