Merge "drm_hwcomposer: limit maximum depth of display composition queue" into mnc...

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

diff --git a/Android.mk b/Android.mk
index e20615e..de1658f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -37,18 +37,18 @@ 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 \
-       gl_compositor.cpp \
        glworker.cpp \
        hwcomposer.cpp \
        seperate_rects.cpp \