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/hwc1.4/Android.mk b/hwc1.4/Android.mk
deleted file mode 100644
index 9991bb5..0000000
--- a/hwc1.4/Android.mk
+++ b/dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 2011 Amlogic
-#
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(TOP)/hardware/amlogic/media/media_base_config.mk
-# HAL module implemenation, not prelinked and stored in
-# /system/lib/hw/hwcomposer.amlogic.so
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libEGL libutils libcutils libhardware libsync libfbcnf libhardware_legacy
-LOCAL_STATIC_LIBRARIES := libomxutil
-LOCAL_SRC_FILES := hwcomposer.cpp
-
-LOCAL_KK=0
-ifeq ($(GPU_TYPE),t83x)
-LOCAL_KK:=1
-endif
-ifeq ($(GPU_ARCH),midgard)
-LOCAL_KK:=1
-endif
-ifeq ($(LOCAL_KK),1)
- LOCAL_CFLAGS += -DMALI_AFBC_GRALLOC=1
-else
- LOCAL_CFLAGS += -DMALI_AFBC_GRALLOC=0
-endif
-
-MESON_GRALLOC_DIR ?= hardware/amlogic/gralloc
-
-LOCAL_C_INCLUDES += \
- $(MESON_GRALLOC_DIR)
-
-LOCAL_C_INCLUDES += system/core/libion/include/ \
- system/core/libion/kernel-headers
-
-ifneq ($(WITH_LIBPLAYER_MODULE),false)
-LOCAL_SHARED_LIBRARIES += libamavutils_alsa
-LOCAL_C_INCLUDES += \
- $(AMAVUTILS_PATH)/include
-LOCAL_CFLAGS += -DWITH_LIBPLAYER_MODULE=1
-endif
-
-ifeq ($(TARGET_EXTERNAL_DISPLAY),true)
-LOCAL_CFLAGS += -DWITH_EXTERNAL_DISPLAY
-ifeq ($(TARGET_SINGLE_EXTERNAL_DISPLAY_USE_FB1),true)
-LOCAL_CFLAGS += -DSINGLE_EXTERNAL_DISPLAY_USE_FB1
-endif
-endif
-
-LOCAL_MODULE := hwcomposer.amlogic
-LOCAL_CFLAGS += -DLOG_TAG=\"hwcomposer\"
-LOCAL_MODULE_TAGS := optional
-
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
-LOCAL_PROPRIETARY_MODULE := true
-endif
-
-include $(BUILD_SHARED_LIBRARY)
-