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: 370842132
Bug: 346868433
Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets
Flag: EXEMPT bugfix
Change-Id: I4dba20518925a176f1e1e66596e2bb1e8ade7c26
Merged-In: I4dba20518925a176f1e1e66596e2bb1e8ade7c26
This commit is contained in:
Juan Yescas 2024-06-26 21:34:18 -07:00 committed by Vilas Bhat
parent 72946bd429
commit 0420e6dfff

View file

@ -362,7 +362,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.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 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 += \ PRODUCT_COPY_FILES += \
device/google/zuma/conf/init.efs.16k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc \ 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 \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \