From b08bf20df869d5d412d8e8a7a6619c556af6fa7f Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Wed, 3 Jul 2024 20:21:00 +0000 Subject: [PATCH] 16k: Do not set TARGET_ vars in device-akita.mk TARGET_ build variables MUST NOT be set up in device* files. In the device* files, the PRODUCT_ variables are not defined properly and only after the build system finishes parsing all the product files, we can set up TARGET_ vars based on PRODUCT_ vars. During the parsing of the BoardConfig files, the PRODUCT_ vars are defined and their values can not be changed. The variables removed affect only 16kb page size target and they are set in either device/google/zuma/BoardConfig-16k-common.mk (which is already inherited by device-akita.mk) or in akita_16k.mk. Bug: 349877551 Test: $ lunch akita_16k-trunk_staging-userdebug $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE ext4 $ get_build_var TARGET_KERNEL_DIR device/google/akita-kernels/6.1/trunk-12043309/16kb $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE ext4 Flag: EXEMPT bugfix Change-Id: Ia62ed7f3f794390d2f9344cf394046f013c63838 --- device-akita.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/device-akita.mk b/device-akita.mk index a62ee0f..99291f9 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -29,12 +29,6 @@ TARGET_KERNEL_DIR ?= device/google/akita-kernels/5.15/trunk TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernels/5.15/trunk/kernel-headers endif -ifeq ($(PRODUCT_BOOTS_16K),true) -TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_KERNEL_DIR := $(RELEASE_KERNEL_AKITA_DIR)/16kb -TARGET_RW_FILE_SYSTEM_TYPE := ext4 -endif - $(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.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)