From 03e01e352465183a8c026ffbe324510d75935308 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Thu, 23 May 2024 06:39:38 +0000 Subject: [PATCH 1/3] Update IDisplay to V12 Test: trigger test build Bug: 309897479 Change-Id: Id60df728563ccad7392f72a7e78c78b63a894929 Signed-off-by: Leo Chen --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 2aa37e9..59d5bf9 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -114,7 +114,7 @@ com.google.hardware.pixel.display - 11-12 + 12 IDisplay default From fae17e2f416a7c205375d63503770a6e111fcfc3 Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 10 Jun 2024 03:20:45 +0000 Subject: [PATCH 2/3] zumapro: build fingerprint dump Bug: 346450599 Test: adb bugreport Change-Id: Ic623a7b69110e1bb9c69544945d6180fbae2d30f --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 1fdf915..619d639 100644 --- a/device.mk +++ b/device.mk @@ -43,6 +43,7 @@ include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk include device/google/gs-common/betterbug/betterbug.mk include device/google/gs-common/recorder/recorder.mk +include device/google/gs-common/fingerprint/fingerprint.mk include device/google/zumapro/dumpstate/item.mk From 931d5dc1638b9dc2a5f39bfaa0f61a0dd913cf04 Mon Sep 17 00:00:00 2001 From: Cathy Hsu Date: Tue, 4 Jun 2024 08:58:11 +0000 Subject: [PATCH 3/3] Remove display related warnings Bug: 338548109 Bug: 340971451 Bug: 340971442 Test: No display warnings show Change-Id: I38ae75b67ce2779cd908ab31ef4fb1a61e00e45e --- BoardConfig-common.mk | 4 ---- device.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index e8f2f7c..099c238 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -150,8 +150,6 @@ endif #display_unit_test ifeq ($(USES_DEVICE_GOOGLE_ZUMAPRO),true) -# TODO(b/272725898): Needs to check with owner later -$(warning display_unit_test set to zuma on zumapro target) $(call soong_config_set,display_unit_test,soc,zuma) endif @@ -280,8 +278,6 @@ HWC_SUPPORT_COLOR_TRANSFORM := true BOARD_USES_EXYNOS_AFBC_FEATURE := true #BOARD_USES_HDRUI_GLES_CONVERSION := true -# TODO(b/272725898): Needs to check with owner later -$(warning BOARD_LIBACRYL_DEFAULT_COMPOSITOR set to zuma on zumapro target) BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_zuma BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin diff --git a/device.mk b/device.mk index daad46c..a92b247 100644 --- a/device.mk +++ b/device.mk @@ -67,8 +67,6 @@ ifeq ($(USE_PIXEL_GRALLOC),true) PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL endif -# TODO(b/272725898): Needs to check with owner later -$(warning hardware/google/graphics/zuma set to zuma on zumapro target) PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ hardware/google/gchips \ @@ -935,8 +933,6 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_PACKAGES += \ trusty_metricsd -# TODO(b/272725898): Needs to check with owner later -$(warning displaycolor_platform set to zuma on zumapro target) $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma) PRODUCT_PACKAGES += \ android.hardware.composer.hwc3-service.pixel \