21 files changed, 138 insertions, 22 deletions
diff --git a/hwc2/Android.mk b/hwc2/Android.mk index 5d43f10..9304362 100644 --- a/hwc2/Android.mk +++ b/hwc2/Android.mk @@ -17,14 +17,13 @@ ifeq ($(USE_HWC2), true) $(info "Build HWC 2.0") LOCAL_PATH := $(call my-dir) + include $(CLEAR_VARS) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28 && echo OK),OK) LOCAL_PROPRIETARY_MODULE := true endif -LOCAL_MODULE_RELATIVE_PATH := hw - LOCAL_CPPFLAGS := $(HWC_CPP_FLAGS) LOCAL_CFLAGS := $(HWC_C_FLAGS) LOCAL_SHARED_LIBRARIES := $(HWC_SHARED_LIBS) @@ -42,12 +41,6 @@ LOCAL_SRC_FILES := \ Hwc2Base.cpp \ Hwc2Display.cpp \ Hwc2Layer.cpp \ - Hwc2Module.cpp \ - HwcModeMgr.cpp \ - FixedSizeModeMgr.cpp \ - VariableModeMgr.cpp \ - ActiveModeMgr.cpp \ - RealModeMgr.cpp \ MesonHwc2.cpp LOCAL_C_INCLUDES := \ @@ -66,6 +59,59 @@ LOCAL_STATIC_LIBRARIES := \ libomxutil LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := hwc.composer_static + +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH) + +include $(BUILD_STATIC_LIBRARY) + + +include $(CLEAR_VARS) + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + +LOCAL_MODULE_RELATIVE_PATH := hw + +LOCAL_CPPFLAGS := $(HWC_CPP_FLAGS) +LOCAL_CFLAGS := $(HWC_C_FLAGS) +LOCAL_SHARED_LIBRARIES := \ + $(HWC_SHARED_LIBS) \ + vendor.amlogic.display.meson_display_ipc@1.0 \ + libmeson_display_service + +# hwc 2.2 interface enable +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28 && echo OK),OK) +LOCAL_CFLAGS += -DHWC_HDR_METADATA_SUPPORT +endif + +ifeq ($(HWC_SUPPORT_MODES_LIST), true) +LOCAL_CFLAGS += -DHWC_SUPPORT_MODES_LIST +endif + +LOCAL_SRC_FILES := \ + Hwc2Module.cpp + +LOCAL_C_INCLUDES := \ + hardware/libhardware/include \ + $(LOCAL_PATH)/include + +# !!! static lib sequence is serious, donot change it. +LOCAL_STATIC_LIBRARIES := \ + libmeson_display_adapter_local \ + hwc.composer_static \ + hwc.common_static \ + hwc.composition_static \ + hwc.postprocessor_static \ + hwc.display_static \ + hwc.base_static \ + hwc.utils_static \ + hwc.debug_static \ + libomxutil + +LOCAL_MODULE_TAGS := optional LOCAL_MODULE := hwcomposer.amlogic include $(BUILD_SHARED_LIBRARY) |