From 73c64fff2104a5accaec04816d692e6a5159f3e8 Mon Sep 17 00:00:00 2001
From: Juan Yescas <jyescas@google.com>
Date: Wed, 26 Jun 2024 21:28:09 -0700
Subject: [PATCH] 16kb: Use PRODUCT_BOOTS_16K to select the kernel and fs

The build flag PRODUCT_BOOTS_16K will be used to select
whether the shusky devices boot with 16kb kernel or 4kb kernel.

Bug: 346868433
Test: Built Pixel 8 targets
      $ source build/envsetup.sh
      $ lunch husky_pgagnostic-trunk_staging-userdebug
      $ get_build_var DEVICE_PAGE_AGNOSTIC
      $ get_build_var TARGET_KERNEL_DIR
      device/google/shusky-kernels/6.1/trunk-12010727/16kb
      $ get_build_var TARGET_BOARD_KERNEL_HEADERS
      device/google/shusky-kernels/6.1/trunk-12010727/kernel-headers
      $ get_build_var PRODUCT_BOOTS_16K
      true
      $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE
      ext4
      $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE
      ext4
Flag: EXEMPT bugfix
Change-Id: Ia75c7f8cfca6d651777c730a3f86715a0991fbec
---
 device-husky.mk | 4 +---
 device-shiba.mk | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index aad692e..93d9742 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
     include device/google/shusky/uwb/uwb_calibration.mk
 endif
 
-DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
-
-ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
+ifeq ($(PRODUCT_BOOTS_16K),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4
diff --git a/device-shiba.mk b/device-shiba.mk
index 4965a07..a2c19b9 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
 
 LOCAL_PATH := device/google/shusky
 
-DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
-
-ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
+ifeq ($(PRODUCT_BOOTS_16K),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4