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 6236c57..810caac 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -12,35 +12,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+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 := gralloc
-
 LOCAL_SHARED_LIBRARIES := \
+       libcutils \
        libdrm \
+       libEGL \
+       libGLESv2 \
        libhardware \
        liblog \
-       libstlport \
        libsync \
-       libutils \
+       libui \
+       libutils
+
 
 LOCAL_C_INCLUDES := \
-       bionic \
        external/libdrm \
        external/libdrm/include/drm \
-       external/stlport/stlport \
        system/core/include/utils \
+       system/core/libsync \
        system/core/libsync/include \
 
-LOCAL_CFLAGS :=
-LOCAL_SRC_FILES := hwcomposer.cpp
+LOCAL_SRC_FILES := \
+       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)),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_drm_gralloc.cpp
+LOCAL_SRC_FILES += drmgenericimporter.cpp
+LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER
 endif
 
 LOCAL_MODULE := hwcomposer.drm
@@ -49,3 +71,5 @@ LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(TARGET_SHLIB_SUFFIX)
 include $(BUILD_SHARED_LIBRARY)
+
+endif