summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--hwc2/common/base/Hwcomposer.cpp7
-rw-r--r--hwc2/common/devices/PhysicalDevice.cpp53
-rw-r--r--hwc2/common/hdmi/DisplayHdmi.cpp121
-rw-r--r--hwc2/common/hdmi/DisplayHdmi.h19
-rw-r--r--hwc2/platforms/Android.mk13
5 files changed, 175 insertions, 38 deletions
diff --git a/hwc2/platforms/Android.mk b/hwc2/platforms/Android.mk
index 31b6698..76782d6 100644
--- a/hwc2/platforms/Android.mk
+++ b/hwc2/platforms/Android.mk
@@ -16,7 +16,7 @@ endif
LOCAL_SRC_FILES := \
../common/base/HwcLayer.cpp \
- ../common/base/HwcFenceControl.cpp \
+ ../common/base/HwcFenceControl.cpp \
../common/base/Hwcomposer.cpp \
../common/base/HwcModule.cpp \
../common/base/VsyncManager.cpp \
@@ -37,7 +37,7 @@ LOCAL_SRC_FILES += \
LOCAL_SHARED_LIBRARIES := \
libcutils \
liblog \
- libEGL \
+ libEGL \
libdl \
libhardware \
libutils \
@@ -49,6 +49,13 @@ LOCAL_SHARED_LIBRARIES := \
libsystemcontrolservice \
libgui
+# added for treble
+LOCAL_SHARED_LIBRARIES += \
+ vendor.amlogic.hardware.systemcontrol@1.0 \
+ libbase \
+ libhidlbase \
+ libhidltransport
+
LOCAL_STATIC_LIBRARIES := \
libomxutil
@@ -95,6 +102,8 @@ LOCAL_C_INCLUDES += $(MESON_GRALLOC_DIR)
LOCAL_C_INCLUDES += system/core/libion/include/ \
system/core/libion/kernel-headers
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
+
ifeq ($(TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER),true)
LOCAL_CFLAGS += -DUSE_CONTINOUS_BUFFER_COMPOSER
# LOCAL_CFLAGS += -DENABLE_AML_GE2D_COMPOSER