From 22eeae1c3a53d37d301ebb4fd64e190b33f5b6af Mon Sep 17 00:00:00 2001
From: Chris Lu <luchris@google.com>
Date: Thu, 18 Jul 2024 09:15:04 +0000
Subject: [PATCH 1/2] Upgrade IDisplay to V13

Bug: 315496839
Flag: EXEMPT bugfix
Test: build pass
Change-Id: I960990b161b82e497d5e1f3b891d6cde09384d87
---
 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 895ce99b..ead4cd93 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -114,7 +114,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>12</version>
+        <version>13</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>

From 8cd5a64cd7aa45682b749e008e75eb66801b0890 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 2 Aug 2024 09:14:34 +0000
Subject: [PATCH 2/2] 16k: Ignore 16k kernel settings if 16kb folder doesn't
 exist

to avoid build breakage with test kernel prebuilts (e.g. ag/28525733)
that doesn't have 16kb artifacts in it.

Bug: 349877551
Flag: EXEMPT bugfix
Change-Id: I2f6c1f3365f624502366b883dbcd1066ed166cdb
---
 BoardConfig-16k-common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk
index 0571d7a5..4b9c64ab 100644
--- a/BoardConfig-16k-common.mk
+++ b/BoardConfig-16k-common.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
+
 ifeq ($(TARGET_BOOTS_16K),true)
 # Configures the 16kb kernel directory.
 TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
@@ -35,3 +37,5 @@ BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(
 
 BOARD_16K_OTA_MOVE_VENDOR := true
 endif
+
+endif