From 98f2222e27fc6a57b3731107050757192d5788ff Mon Sep 17 00:00:00 2001
From: Juan Yescas <jyescas@google.com>
Date: Wed, 26 Jun 2024 21:34:18 -0700
Subject: [PATCH] 16kb: Use PRODUCT_BOOTS_16K to select the proper rc file and
 fstab

The build flag PRODUCT_BOOTS_16K will be used to select
the proper efs rc file and fstab:

- When PRODUCT_BOOTS_16K := true, 16k rc files and fstab will be used.
- When PRODUCT_BOOTS_16K := false, 4k rc files and fstab will be used.

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: I4dba20518925a176f1e1e66596e2bb1e8ade7c26
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 542fdc9e..fde03f30 100644
--- a/device.mk
+++ b/device.mk
@@ -361,7 +361,7 @@ PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc \
 	device/google/zuma/conf/init.persist.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.persist.rc
 
-ifeq (true,$(filter $(DEVICE_PAGE_AGNOSTIC) $(PRODUCT_16K_DEVELOPER_OPTION),true))
+ifeq (true,$(filter $(PRODUCT_BOOTS_16K) $(PRODUCT_16K_DEVELOPER_OPTION),true))
 PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.efs.16k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc \
 	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \