From af36185b926e48177d04e7e8edc7d879217edcb6 Mon Sep 17 00:00:00 2001
From: Jeremy DeHaan <jdehaan@google.com>
Date: Mon, 16 May 2022 23:16:59 +0000
Subject: [PATCH 1/3] gs101: Update IDisplay to V6

Bug: 228113713
Change-Id: I8b0f5f5141b0475c3f3034d24af0b736f0405779
Merged-In: I8b0f5f5141b0475c3f3034d24af0b736f0405779
---
 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 a1e4e779..863fc2ab 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -73,7 +73,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>4</version>
+        <version>6</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>

From 868fd3837fb319abb9049fcf9456c50e464a529d Mon Sep 17 00:00:00 2001
From: Ioannis Ilkos <ilkos@google.com>
Date: Mon, 30 May 2022 17:55:38 +0000
Subject: [PATCH 2/3] Revert "Switch Pixel 6 GLES system driver to ANGLE"

This reverts commit 22fe58d38950dfcc9c018bb8cbf6712606d38cc1.

Reason for revert: b/234156322

Change-Id: I7902283839c7501d374fa4daf6e02e1bca54d390
---
 BoardConfig-common.mk |  3 ---
 device.mk             | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index e20de817..d712d600 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -115,9 +115,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 # This should be the same value as USE_SWIFTSHADER in device.mk
 BOARD_USES_SWIFTSHADER := false
 
-# This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := true
-
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
 $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
diff --git a/device.mk b/device.mk
index a86fe3f6..099ae227 100644
--- a/device.mk
+++ b/device.mk
@@ -179,9 +179,6 @@ endif
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
 USE_SWIFTSHADER := false
 
-# Must match BOARD_USES_ANGLE in BoardConfig.mk
-USE_ANGLE := true
-
 # HWUI
 TARGET_USES_VULKAN = true
 
@@ -211,13 +208,6 @@ PRODUCT_PACKAGES += \
 	libGLESv2_swiftshader
 endif
 
-ifeq ($(USE_ANGLE),true)
-PRODUCT_PACKAGES += \
-	libEGL_angle \
-	libGLESv1_CM_angle \
-	libGLESv2_angle
-endif
-
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -229,10 +219,6 @@ PRODUCT_COPY_FILES += \
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = swiftshader
-else ifeq ($(USE_ANGLE),true)
-PRODUCT_VENDOR_PROPERTIES += \
-	ro.hardware.egl = angle \
-	ro.hardware.egl_legacy = mali
 else
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = mali

From dc2fe4cbd538e66fa4c8fdf559c7c1d3e74a6b89 Mon Sep 17 00:00:00 2001
From: Ankit Goyal <layog@google.com>
Date: Tue, 31 May 2022 18:20:14 -0700
Subject: [PATCH 3/3] gralloc: Remove redundant gralloc namespaces

Bug: 232572182
Test: Raven boots to home
Change-Id: I059a2efe27fb37d20cbfd25f3011300cbed5a850
---
 device.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/device.mk b/device.mk
index 099ae227..6fc646a4 100644
--- a/device.mk
+++ b/device.mk
@@ -35,12 +35,6 @@ VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 # Set boot SPL
 BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 
-# TODO(b/207450311): Remove this flag once implemented
-USE_PIXEL_GRALLOC := false
-ifeq ($(USE_PIXEL_GRALLOC),true)
-	PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL
-endif
-
 PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/av \
 	hardware/google/gchips \