Snap for 12032182 from 73c64fff21 to 24Q4-release

Change-Id: Id4b0bdf7b911ea3d842a9aaf4d7f8d252e046a66
This commit is contained in:
Android Build Coastguard Worker 2024-06-29 03:03:09 +00:00
commit 8bba9291b9
2 changed files with 2 additions and 6 deletions

View file

@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
include device/google/shusky/uwb/uwb_calibration.mk include device/google/shusky/uwb/uwb_calibration.mk
endif endif
DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) ifeq ($(PRODUCT_BOOTS_16K),true)
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_RW_FILE_SYSTEM_TYPE := ext4

View file

@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky
DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) ifeq ($(PRODUCT_BOOTS_16K),true)
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_RW_FILE_SYSTEM_TYPE := ext4