From 9d9461e28fa8a2de3080b79b484930de5dd6f7f7 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ianelliott@google.com>
Date: Tue, 20 Dec 2022 15:06:20 -0700
Subject: [PATCH 1/2] Pixel 7 Pro: Use SkiaVk as RenderEngine backend

Test: make, flash, and run applications/tests
Bug: 236390072
Change-Id: I047b827a585776cfd759fa000cd2c7d1a3842ff0
---
 device.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 9cb81a9a..9b51d6ca 100644
--- a/device.mk
+++ b/device.mk
@@ -269,8 +269,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
-	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiaglthreaded \
+	graphics.gpu.profiler.support=true
+# Enable SkiaVk for RenderEngine on Cheetah
+ifneq (,$(filter %cheetah, $(TARGET_PRODUCT)))
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiavkthreaded
+else
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiaglthreaded
+endif
 
 # GRAPHICS - GPU (end)
 # ####################

From d3f3be85cee4fa4455a66f67543895bb71316103 Mon Sep 17 00:00:00 2001
From: Midas Chien <midaschieh@google.com>
Date: Wed, 15 Mar 2023 06:41:50 +0000
Subject: [PATCH 2/2] Update IComposer to V2

Bug: 271221392
Test: run vts -m vts_treble_vintf_vendor_test
Change-Id: I0bf81743ddd0b56cb06cea336984eff898a6f621
---
 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 5d6cf695..e906ab0d 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -9,7 +9,7 @@
     </hal>
     <hal format="aidl">
         <name>android.hardware.graphics.composer3</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>