From eeb96877615a3bd2b41908bda32598cb60cd3ab7 Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Sun, 16 Oct 2022 13:05:42 +0000
Subject: [PATCH 1/2] Revert "Switch GLES system driver to ANGLE"

This reverts commit 2ece1b7eb1d1675d9a03029416b07f6467a54b23.

Reason for revert: Platinum/DM rotation revert for likely breaking tests and causing b/253694548

Change-Id: Ie1e5a31b2a094ebec9359906665586c6de6fc882
---
 BoardConfig-common.mk | 2 +-
 device.mk             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a5c80ac0..4ba05807 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -129,7 +129,7 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := true
+BOARD_USES_ANGLE := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
diff --git a/device.mk b/device.mk
index e1d0ab3d..9a45af59 100644
--- a/device.mk
+++ b/device.mk
@@ -203,7 +203,7 @@ endif
 USE_SWIFTSHADER := false
 
 # Must match BOARD_USES_ANGLE in BoardConfig.mk
-USE_ANGLE := true
+USE_ANGLE := false
 
 # HWUI
 TARGET_USES_VULKAN = true

From 19177f8ada523eac0ff2f637b6e8df55271733da Mon Sep 17 00:00:00 2001
From: Speth Chang <spethchang@google.com>
Date: Fri, 14 Oct 2022 10:52:47 +0800
Subject: [PATCH 2/2] gs201: create catpipe folder for camera useage

The folder will be used for place the necessary libraries that used by
catpipe functions.

Bug: 249274299
Test: build pass, check the folder with user build
Change-Id: Ibb54e7c0b171f355ee2b71099533afe15ba09e99
---
 conf/init.gs201.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 76c1ffed..9ac1c931 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -380,6 +380,7 @@ on post-fs-data
 
     # Permissions Camera
     mkdir /data/vendor/camera 0770 system camera
+    mkdir /data/vendor/camera/catpipe 0770 system camera
     mkdir /data/vendor/camera/video_bokeh_node 0770 system camera
     chmod 0755 /sys/kernel/debug/tracing
     restorecon /sys/kernel/debug/tracing/trace_marker