Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d265c423 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

surfaceflinger: remove TARGET_USES_HWC2 

Remove TARGET_USES_HWC2 and assume it to be true.  Remove the unused
SurfaceFlinger_hwc1.cpp and DisplayHardware/HWComposer_hwc1.cpp.

This is expected to break some devices.  All affected devices should
add

  PRODUCT_PACKAGES += android.hardware.graphics.composer@2.1-impl

to their device.mk and update their manifest.xml.  In the worse
case, we want to fork frameworks/native/services/surfaceflinger
before this change to
frameworks/native/services/surfaceflinger_hwc1.

Test: boots taimen and hikey960
Change-Id: I27ddd4c6c8af3c39cda99d94002d179486575b28
parent de1eb9c0

services/surfaceflinger/Android.mk

+4 −14
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \ 
    LayerVector.cpp \

    LayerVector.cpp \

    MessageQueue.cpp \

    MessageQueue.cpp \

    MonitoredProducer.cpp \

    MonitoredProducer.cpp \

    SurfaceFlinger.cpp \

    SurfaceFlingerConsumer.cpp \

    SurfaceFlingerConsumer.cpp \

    SurfaceInterceptor.cpp \

    SurfaceInterceptor.cpp \

    SurfaceTracing.cpp \

    SurfaceTracing.cpp \
@@ -27,6 +28,7 @@ LOCAL_SRC_FILES := \ 
    DisplayHardware/ComposerHal.cpp \

    DisplayHardware/ComposerHal.cpp \

    DisplayHardware/FramebufferSurface.cpp \

    DisplayHardware/FramebufferSurface.cpp \

    DisplayHardware/HWC2.cpp \

    DisplayHardware/HWC2.cpp \

    DisplayHardware/HWComposer.cpp \

    DisplayHardware/HWComposerBufferCache.cpp \

    DisplayHardware/HWComposerBufferCache.cpp \

    DisplayHardware/PowerHAL.cpp \

    DisplayHardware/PowerHAL.cpp \

    DisplayHardware/VirtualDisplaySurface.cpp \

    DisplayHardware/VirtualDisplaySurface.cpp \
@@ -52,17 +54,7 @@ LOCAL_C_INCLUDES := \ 




LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES



ifeq ($(TARGET_USES_HWC2),true)

LOCAL_CFLAGS += -DUSE_HWC2

LOCAL_CFLAGS += -DUSE_HWC2

    LOCAL_SRC_FILES += \

        SurfaceFlinger.cpp \

        DisplayHardware/HWComposer.cpp

else

    LOCAL_SRC_FILES += \

        SurfaceFlinger_hwc1.cpp \

        DisplayHardware/HWComposer_hwc1.cpp

endif





LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
@@ -128,9 +120,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\" 




LOCAL_INIT_RC := surfaceflinger.rc

LOCAL_INIT_RC := surfaceflinger.rc





ifeq ($(TARGET_USES_HWC2),true)

LOCAL_CFLAGS += -DUSE_HWC2

LOCAL_CFLAGS += -DUSE_HWC2

endif





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

    main_surfaceflinger.cpp

    main_surfaceflinger.cpp

services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp

deleted100644 → 0
+0 −1346

File deleted.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

deleted100644 → 0
+0 −4169

File deleted.

Preview size limit exceeded, changes collapsed.