From 5126f46c8a10784bd262422400007385dfc75576 Mon Sep 17 00:00:00 2001
From: Herbert Xue <herbertxue@google.com>
Date: Thu, 8 Aug 2024 15:49:52 +0800
Subject: [PATCH 1/2] Control the build path of mali_csffw.bin

Flag: EXEMPT bugfix
Bug: 357770476
Test: 1. lunch akita-trunk_staging-eng
      2. m csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin
Change-Id: I80d2820f24dadf09ada1e090e9588bd8a0e7c453
---
 device.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/device.mk b/device.mk
index 305db863..38083308 100644
--- a/device.mk
+++ b/device.mk
@@ -259,8 +259,13 @@ USE_SWIFTSHADER := false
 # HWUI
 TARGET_USES_VULKAN = true
 
+ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/google_devices/zuma/prebuilts/firmware/gpu
+else
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/arm/mali/valhall
+endif
 
 $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 $(call soong_config_set,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM))

From 4c5e386a84001df2d563c590ca083b9477b9fac3 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Fri, 9 Aug 2024 08:34:33 +0000
Subject: [PATCH 2/2] Add FSTAB_OWNERS and update OWNERS to include Android.bp

Flag: EXEMPT only changing OWNERS
Bug: 357036384
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c28299c722226798388ceeade9859f05c6d33a1)
Merged-In: I473ff74c06daabcd635eb464766f04725a2c2fbd
Change-Id: I473ff74c06daabcd635eb464766f04725a2c2fbd
---
 OWNERS      | 2 +-
 conf/OWNERS | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 conf/OWNERS

diff --git a/OWNERS b/OWNERS
index e6ce5d01..d1ffbd2a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/conf/OWNERS b/conf/OWNERS
new file mode 100644
index 00000000..20af85b0
--- /dev/null
+++ b/conf/OWNERS
@@ -0,0 +1,2 @@
+# per-file for Pixel fstab
+per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS