From fe86e10394c354a0aa6d634a171e154fb1013e36 Mon Sep 17 00:00:00 2001
From: Ankit Goyal <layog@google.com>
Date: Wed, 28 Aug 2024 22:54:00 -0700
Subject: [PATCH 1/2] Delete mapper4 manifest

Bug: 362183626
Flag: EXEMPT manifest update
Test: Boot to home on shiba
Change-Id: I828ee34e1de2fb0ac228688517d4be89e43247d1
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 34b0326d..8c6ed15e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,4 @@
 <manifest version="1.0" type="device" target-level="7">
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>

From 646cc8fdcfeb9ab05244345dd5c1c4c7dd565e1a Mon Sep 17 00:00:00 2001
From: kellyhung <kellyhung@google.com>
Date: Fri, 23 Aug 2024 13:04:47 +0800
Subject: [PATCH 2/2] Add soong config use_google_qns in
 device/google/gs201/device.mk

Bug: 360757079
Test: lunch r11-trunk_staging-userdebug; m grilservice
Flag: EXEMPT bugfix

Change-Id: Ia10d6d73f7349b6a5de5046236c8498f54962036
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 726de305..eeecde31 100644
--- a/device.mk
+++ b/device.mk
@@ -212,6 +212,7 @@ USE_LASSEN_OEMHOOK := true
 ifneq ($(BOARD_WITHOUT_RADIO),true)
     PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
     $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
+    $(call soong_config_set,grilservice,use_google_qns,true)
 endif
 
 # Use for GRIL