diff options
| author | Weizhung Ding <weizhungding@google.com> | 2020-01-03 10:48:43 +0800 |
|---|---|---|
| committer | Weizhung Ding <weizhungding@google.com> | 2020-01-09 03:20:37 +0000 |
| commit | 1a5a729ea4773d21339e739d3ac12c1eab279a75 (patch) | |
| tree | 91669de8d712e376b9563c20cf8ebbf605834a4c /sdm/libs/hwc2/Android.mk | |
| parent | e6699a99b09b25c499800dd91883b9f0f4011855 (diff) | |
| download | display-1a5a729ea4773d21339e739d3ac12c1eab279a75.tar.gz | |
revert conflict commits from AU053
Drop the changes from 8.9.R1 and focus on 8.1.C9.
Bug: 146767069
Test: boot to home
Change-Id: I3a7d6a5e477912862fb48ed908a09f929612ec4b
Diffstat (limited to 'sdm/libs/hwc2/Android.mk')
| -rw-r--r-- | sdm/libs/hwc2/Android.mk | 80 |
1 files changed, 65 insertions, 15 deletions
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk index 8eca84b5..353a51e5 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -22,29 +22,80 @@ LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware li libutils libcutils libsync libqdutils libqdMetaData \ libdisplaydebug libsdmutils libc++ liblog libgrallocutils libui \ libgpu_tonemapper libhidlbase libhidltransport \ + vendor.display.config@1.0 \ android.hardware.graphics.mapper@2.0 \ android.hardware.graphics.mapper@2.1 \ - android.hardware.graphics.mapper@3.0 \ android.hardware.graphics.allocator@2.0 \ - android.hardware.graphics.allocator@3.0 \ android.hardware.graphics.composer@2.2 \ - vendor.display.config@1.0 \ - vendor.display.config@1.1 \ - vendor.display.config@1.2 \ - vendor.display.config@1.3 \ - vendor.display.config@1.4 \ - vendor.display.config@1.5 \ - vendor.display.config@1.6 \ - vendor.display.config@1.7 \ - vendor.display.config@1.8 \ - vendor.display.config@1.9 \ - vendor.display.config@1.10 \ - vendor.display.config@1.11 \ hardware.google.light@1.0 \ libdrm.vendor LOCAL_STATIC_LIBRARIES := libhistogram +$(info IDisplayConfig version: $(display_config_version)) +ifeq ($(display_config_version), DISPLAY_CONFIG_1_1) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_2) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 vendor.display.config@1.1 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_3) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_4) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_5) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.5 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_6) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.5 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.6 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_7) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.5 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.6 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.7 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_8) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.5 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.6 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.7 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.8 +endif +ifeq ($(display_config_version), DISPLAY_CONFIG_1_9) +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.2 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.3 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.5 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.6 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.7 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.8 +LOCAL_SHARED_LIBRARIES += vendor.display.config@1.9 +endif + ifeq ($(TARGET_BOARD_AUTO), true) LOCAL_CFLAGS += -DCONFIG_BASEID_FROM_PROP endif @@ -54,7 +105,6 @@ LOCAL_SRC_FILES := hwc_session.cpp \ hwc_display.cpp \ hwc_display_builtin.cpp \ hwc_display_pluggable.cpp \ - hwc_display_dummy.cpp \ hwc_display_pluggable_test.cpp \ hwc_display_virtual.cpp \ hwc_debugger.cpp \ |