Add more BoardConfig variables to stash list
I would like to centralize/standardize the BoardConfig variable sanity checking in a file similar to product_config.mk, but for now just add a few more standard BoardConfig variables to the .KATI_READONLY list. Also fix the inconsistent indentation in this file. Test: make Change-Id: I2a878b95ffc07e3f5bc4eb4970775bdef347e094
This commit is contained in:
Anton Hansson
parent
dd025116cd
commit
70222b21ee
1 changed files with 63 additions and 59 deletions
122
core/product.mk
122
core/product.mk
|
|
@ -368,69 +368,73 @@ endef
|
|||
|
||||
|
||||
_product_stash_var_list := $(_product_var_list) \
|
||||
PRODUCT_BOOTCLASSPATH \
|
||||
PRODUCT_SYSTEM_SERVER_CLASSPATH \
|
||||
TARGET_ARCH \
|
||||
TARGET_ARCH_VARIANT \
|
||||
TARGET_CPU_VARIANT \
|
||||
TARGET_BOARD_PLATFORM \
|
||||
TARGET_BOARD_PLATFORM_GPU \
|
||||
TARGET_BOARD_KERNEL_HEADERS \
|
||||
TARGET_DEVICE_KERNEL_HEADERS \
|
||||
TARGET_PRODUCT_KERNEL_HEADERS \
|
||||
TARGET_BOOTLOADER_BOARD_NAME \
|
||||
TARGET_NO_BOOTLOADER \
|
||||
TARGET_NO_KERNEL \
|
||||
TARGET_NO_RECOVERY \
|
||||
TARGET_NO_RADIOIMAGE \
|
||||
TARGET_HARDWARE_3D \
|
||||
TARGET_CPU_ABI \
|
||||
TARGET_CPU_ABI2 \
|
||||
PRODUCT_BOOTCLASSPATH \
|
||||
PRODUCT_SYSTEM_SERVER_CLASSPATH \
|
||||
TARGET_ARCH \
|
||||
TARGET_ARCH_VARIANT \
|
||||
TARGET_CPU_ABI \
|
||||
TARGET_CPU_ABI2 \
|
||||
TARGET_CPU_VARIANT \
|
||||
TARGET_2ND_ARCH \
|
||||
TARGET_2ND_ARCH_VARIANT \
|
||||
TARGET_2ND_CPU_ABI \
|
||||
TARGET_2ND_CPU_ABI2 \
|
||||
TARGET_2ND_CPU_VARIANT \
|
||||
TARGET_BOARD_PLATFORM \
|
||||
TARGET_BOARD_PLATFORM_GPU \
|
||||
TARGET_BOARD_KERNEL_HEADERS \
|
||||
TARGET_DEVICE_KERNEL_HEADERS \
|
||||
TARGET_PRODUCT_KERNEL_HEADERS \
|
||||
TARGET_BOOTLOADER_BOARD_NAME \
|
||||
TARGET_NO_BOOTLOADER \
|
||||
TARGET_NO_KERNEL \
|
||||
TARGET_NO_RECOVERY \
|
||||
TARGET_NO_RADIOIMAGE \
|
||||
TARGET_HARDWARE_3D \
|
||||
|
||||
_product_stash_var_list += \
|
||||
BOARD_WPA_SUPPLICANT_DRIVER \
|
||||
BOARD_WLAN_DEVICE \
|
||||
BOARD_USES_GENERIC_AUDIO \
|
||||
BOARD_KERNEL_CMDLINE \
|
||||
BOARD_KERNEL_BASE \
|
||||
BOARD_HAVE_BLUETOOTH \
|
||||
BOARD_VENDOR_USE_AKMD \
|
||||
BOARD_EGL_CFG \
|
||||
BOARD_BOOTIMAGE_PARTITION_SIZE \
|
||||
BOARD_RECOVERYIMAGE_PARTITION_SIZE \
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE \
|
||||
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE \
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE \
|
||||
BOARD_FLASH_BLOCK_SIZE \
|
||||
BOARD_VENDORIMAGE_PARTITION_SIZE \
|
||||
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_PRODUCTIMAGE_PARTITION_SIZE \
|
||||
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE \
|
||||
BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_ODMIMAGE_PARTITION_SIZE \
|
||||
BOARD_ODMIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_INSTALLER_CMDLINE \
|
||||
|
||||
|
||||
_product_stash_var_list += \
|
||||
BOARD_WPA_SUPPLICANT_DRIVER \
|
||||
BOARD_WLAN_DEVICE \
|
||||
BOARD_USES_GENERIC_AUDIO \
|
||||
BOARD_KERNEL_CMDLINE \
|
||||
BOARD_KERNEL_BASE \
|
||||
BOARD_HAVE_BLUETOOTH \
|
||||
BOARD_VENDOR_USE_AKMD \
|
||||
BOARD_EGL_CFG \
|
||||
BOARD_BOOTIMAGE_PARTITION_SIZE \
|
||||
BOARD_RECOVERYIMAGE_PARTITION_SIZE \
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE \
|
||||
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE \
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE \
|
||||
BOARD_FLASH_BLOCK_SIZE \
|
||||
BOARD_VENDORIMAGE_PARTITION_SIZE \
|
||||
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_PRODUCTIMAGE_PARTITION_SIZE \
|
||||
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE \
|
||||
BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_ODMIMAGE_PARTITION_SIZE \
|
||||
BOARD_ODMIMAGE_FILE_SYSTEM_TYPE \
|
||||
BOARD_INSTALLER_CMDLINE \
|
||||
|
||||
|
||||
_product_stash_var_list += \
|
||||
DEFAULT_SYSTEM_DEV_CERTIFICATE \
|
||||
WITH_DEXPREOPT \
|
||||
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
|
||||
DEFAULT_SYSTEM_DEV_CERTIFICATE \
|
||||
WITH_DEXPREOPT \
|
||||
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
|
||||
|
||||
# Logical partitions related variables.
|
||||
_dynamic_partitions_var_list += \
|
||||
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_SUPER_PARTITION_SIZE \
|
||||
BOARD_SUPER_PARTITION_GROUPS \
|
||||
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE \
|
||||
BOARD_SUPER_PARTITION_SIZE \
|
||||
BOARD_SUPER_PARTITION_GROUPS \
|
||||
|
||||
_product_stash_var_list += $(_dynamic_partitions_var_list)
|
||||
_product_strip_var_list := $(_dynamic_partitions_var_list)
|
||||
|
|
@ -440,8 +444,8 @@ _product_strip_var_list := $(_dynamic_partitions_var_list)
|
|||
#
|
||||
define readonly-product-vars
|
||||
$(foreach v,$(_product_stash_var_list), \
|
||||
$(eval $(v) ?=) \
|
||||
$(eval .KATI_READONLY := $(v)) \
|
||||
$(eval $(v) ?=) \
|
||||
$(eval .KATI_READONLY := $(v)) \
|
||||
)
|
||||
endef
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue