Merge remote-tracking branch 'origin/master' into oreo-x86

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

diff --git a/Android.mk b/Android.mk
index c0a1d0e..45bb3a2 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -53,13 +53,15 @@ LOCAL_C_INCLUDES := \
 LOCAL_SRC_FILES := \
        autolock.cpp \
        drmresources.cpp \
+       drmcomposition.cpp \
+       drmcompositor.cpp \
+       drmcompositorworker.cpp \
        drmconnector.cpp \
        drmcrtc.cpp \
        drmdisplaycomposition.cpp \
        drmdisplaycompositor.cpp \
        drmencoder.cpp \
        drmeventlistener.cpp \
-       drmhwctwo.cpp \
        drmmode.cpp \
        drmplane.cpp \
        drmproperty.cpp \
@@ -71,9 +73,14 @@ LOCAL_SRC_FILES := \
        virtualcompositorworker.cpp \
        vsyncworker.cpp
 
+ifeq ($(strip $(TARGET_USES_HWC2)),true)
+LOCAL_SRC_FILES += drmhwctwo.cpp
 LOCAL_CPPFLAGS += \
        -DHWC2_USE_CPP11 \
        -DHWC2_INCLUDE_STRINGIFICATION
+else
+LOCAL_SRC_FILES += hwcomposer.cpp
+endif
 
 
 ifeq ($(TARGET_PRODUCT),hikey960)