From 9ba0df13009c57a5d058af38320b07a4256d7638 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 13 May 2024 17:13:50 -0700 Subject: [PATCH] 16kb: Configure the file system and kernel for pgagnostic targets Test: $ source build/envsetup.sh $ lunch husky_pgagnostic-trunk_staging-userdebug $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE ext4 $ get_build_var TARGET_KERNEL_DIR device/google/shusky-kernels/5.15/trunk-11828503/16kb Bug: 333734531 Bug: 308663811 Change-Id: I8d69e4df68303351a9d402c4d458061c72499cd7 --- device-husky.mk | 6 ++++++ device-shiba.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 0cf8269..dbf08ce 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,6 +31,12 @@ 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) +TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) diff --git a/device-shiba.mk b/device-shiba.mk index 72b9902..b7f3371 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,6 +24,13 @@ 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) +TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +endif + $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)