p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add more BoardConfig variables to stash list" am: 299ffb7870 

am: 56a0405ec6

Change-Id: I51ca88c3a5c665a3d48783d272fed24f41af23c6
This commit is contained in:
Anton Hansson 2019-02-22 20:34:31 -08:00 committed by android-build-merger
parent e12bfc81b9 56a0405ec6
commit 17a4def424
1 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
core/product.mk
View File

@ -368,69 +368,73 @@ endef
_product_stash_var_list := $(_product_var_list) \ _product_stash_var_list := $(_product_var_list) \
PRODUCT_BOOTCLASSPATH \ PRODUCT_BOOTCLASSPATH \
PRODUCT_SYSTEM_SERVER_CLASSPATH \ PRODUCT_SYSTEM_SERVER_CLASSPATH \
TARGET_ARCH \ TARGET_ARCH \
TARGET_ARCH_VARIANT \ TARGET_ARCH_VARIANT \
TARGET_CPU_VARIANT \ TARGET_CPU_ABI \
TARGET_BOARD_PLATFORM \ TARGET_CPU_ABI2 \
TARGET_BOARD_PLATFORM_GPU \ TARGET_CPU_VARIANT \
TARGET_BOARD_KERNEL_HEADERS \ TARGET_2ND_ARCH \
TARGET_DEVICE_KERNEL_HEADERS \ TARGET_2ND_ARCH_VARIANT \
TARGET_PRODUCT_KERNEL_HEADERS \ TARGET_2ND_CPU_ABI \
TARGET_BOOTLOADER_BOARD_NAME \ TARGET_2ND_CPU_ABI2 \
TARGET_NO_BOOTLOADER \ TARGET_2ND_CPU_VARIANT \
TARGET_NO_KERNEL \ TARGET_BOARD_PLATFORM \
TARGET_NO_RECOVERY \ TARGET_BOARD_PLATFORM_GPU \
TARGET_NO_RADIOIMAGE \ TARGET_BOARD_KERNEL_HEADERS \
TARGET_HARDWARE_3D \ TARGET_DEVICE_KERNEL_HEADERS \
TARGET_CPU_ABI \ TARGET_PRODUCT_KERNEL_HEADERS \
TARGET_CPU_ABI2 \ 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 += \ _product_stash_var_list += \
BOARD_WPA_SUPPLICANT_DRIVER \ DEFAULT_SYSTEM_DEV_CERTIFICATE \
BOARD_WLAN_DEVICE \ WITH_DEXPREOPT \
BOARD_USES_GENERIC_AUDIO \ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
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
# Logical partitions related variables. # Logical partitions related variables.
_dynamic_partitions_var_list += \ _dynamic_partitions_var_list += \
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \ BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \
BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \ BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \
BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \ BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \
BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \ BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \
BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE \ BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE \
BOARD_SUPER_PARTITION_SIZE \ BOARD_SUPER_PARTITION_SIZE \
BOARD_SUPER_PARTITION_GROUPS \ BOARD_SUPER_PARTITION_GROUPS \
_product_stash_var_list += $(_dynamic_partitions_var_list) _product_stash_var_list += $(_dynamic_partitions_var_list)
_product_strip_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 define readonly-product-vars
$(foreach v,$(_product_stash_var_list), \ $(foreach v,$(_product_stash_var_list), \
$(eval $(v) ?=) \ $(eval $(v) ?=) \
$(eval .KATI_READONLY := $(v)) \ $(eval .KATI_READONLY := $(v)) \
) )
endef endef