summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--hwc1.4/Android.mk60
-rw-r--r--hwc1.4/hwcomposer.cpp1202
-rw-r--r--hwc2/common/base/HwcLayer.cpp2
-rw-r--r--hwc2/common/base/HwcLayer.h6
-rw-r--r--hwc2/common/base/HwcModule.cpp9
-rw-r--r--hwc2/common/base/Hwcomposer.cpp14
-rw-r--r--hwc2/common/composers/GE2DComposer.cpp3
-rw-r--r--hwc2/common/composers/GE2DComposer.h6
-rw-r--r--hwc2/common/composers/IComposeDevice.cpp (renamed from hwc2/common/composers/Composers.cpp)10
-rw-r--r--hwc2/common/composers/IComposeDevice.h (renamed from hwc2/common/composers/Composers.h)17
-rw-r--r--hwc2/common/devices/PhysicalDevice.cpp25
-rw-r--r--hwc2/common/devices/PrimaryDevice.cpp2
-rw-r--r--hwc2/common/hdmi/DisplayHdmi.h2
-rw-r--r--hwc2/common/utils/Utils.cpp2
-rw-r--r--hwc2/common/utils/Utils.h5
-rw-r--r--hwc2/include/Hwcomposer.h4
-rw-r--r--hwc2/include/IComposeDeviceFactory.h (renamed from hwc2/include/IComposerFactory.h)16
-rw-r--r--hwc2/include/IComposer.h47
-rw-r--r--hwc2/include/PhysicalDevice.h17
-rw-r--r--hwc2/include/PrimaryDevice.h4
-rw-r--r--hwc2/platforms/Android.mk6
-rw-r--r--hwc2/platforms/PlatFactory.cpp6
22 files changed, 45 insertions, 1420 deletions
diff --git a/hwc2/platforms/Android.mk b/hwc2/platforms/Android.mk
index e15d556..96b2234 100644
--- a/hwc2/platforms/Android.mk
+++ b/hwc2/platforms/Android.mk
@@ -26,7 +26,7 @@ LOCAL_SRC_FILES := \
../common/hdmi/DisplayHdmi.cpp \
../common/observers/SoftVsyncObserver.cpp \
../common/observers/UeventObserver.cpp \
- ../common/composers/Composers.cpp \
+ ../common/composers/IComposeDevice.cpp \
../common/composers/GE2DComposer.cpp \
../common/utils/Utils.cpp \
../common/utils/Dump.cpp \
@@ -115,12 +115,8 @@ ifeq ($(TARGET_SUPPORT_SECURE_LAYER),true)
LOCAL_CFLAGS += -DHWC_SUPPORT_SECURE_LAYER
endif
-WITH_LIBPLAYER_MODULE := true
-ifneq ($(WITH_LIBPLAYER_MODULE),false)
LOCAL_SHARED_LIBRARIES += libamavutils_alsa
#LOCAL_C_INCLUDES += $(AMAVUTILS_PATH)/include
-LOCAL_CFLAGS += -DWITH_LIBPLAYER_MODULE=1
-endif
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := hwcomposer.amlogic