Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" into udc-dev
This commit is contained in:
commit
d043f3bc68
3 changed files with 53 additions and 1 deletions
|
@ -358,6 +358,51 @@ endif
|
|||
# are specific to the user's build configuration.
|
||||
include $(BUILD_SYSTEM)/envsetup.mk
|
||||
|
||||
# Returns true if it is a low memory device, otherwise it returns false.
|
||||
define is-low-mem-device
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_PROPERTY_OVERRIDES)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_COMPATIBLE_PROPERTY)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_SYSTEM_EXT_PROPERTIES)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_PRODUCT_PROPERTIES)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_VENDOR_PROPERTIES)),true,\
|
||||
$(if $(findstring ro.config.low_ram=true,$(PRODUCT_ODM_PROPERTIES)),true,false)))))))))
|
||||
endef
|
||||
|
||||
# Get the board API level.
|
||||
board_api_level := $(PLATFORM_SDK_VERSION)
|
||||
ifdef BOARD_API_LEVEL
|
||||
board_api_level := $(BOARD_API_LEVEL)
|
||||
else ifdef BOARD_SHIPPING_API_LEVEL
|
||||
# Vendors with GRF must define BOARD_SHIPPING_API_LEVEL for the vendor API level.
|
||||
board_api_level := $(BOARD_SHIPPING_API_LEVEL)
|
||||
endif
|
||||
|
||||
# Calculate the VSR vendor API level.
|
||||
vsr_vendor_api_level := $(board_api_level)
|
||||
|
||||
ifdef PRODUCT_SHIPPING_API_LEVEL
|
||||
vsr_vendor_api_level := $(call math_min,$(PRODUCT_SHIPPING_API_LEVEL),$(board_api_level))
|
||||
endif
|
||||
|
||||
# Set TARGET_MAX_PAGE_SIZE_SUPPORTED.
|
||||
ifdef PRODUCT_MAX_PAGE_SIZE_SUPPORTED
|
||||
TARGET_MAX_PAGE_SIZE_SUPPORTED := $(PRODUCT_MAX_PAGE_SIZE_SUPPORTED)
|
||||
else ifeq ($(strip $(call is-low-mem-device)),true)
|
||||
# Low memory device will have 4096 binary alignment.
|
||||
TARGET_MAX_PAGE_SIZE_SUPPORTED := 4096
|
||||
else
|
||||
# The default binary alignment for userspace is 4096.
|
||||
TARGET_MAX_PAGE_SIZE_SUPPORTED := 4096
|
||||
# When VSR vendor API level >= 34, binary alignment will be 65536.
|
||||
ifeq ($(call math_gt_or_eq,$(vsr_vendor_api_level),34),true)
|
||||
TARGET_MAX_PAGE_SIZE_SUPPORTED := 65536
|
||||
endif
|
||||
endif
|
||||
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
|
||||
|
||||
# Pruned directory options used when using findleaves.py
|
||||
# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS
|
||||
FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)
|
||||
|
|
|
@ -27,7 +27,13 @@ _product_single_value_vars += PRODUCT_MODEL
|
|||
_product_single_value_vars += PRODUCT_NAME_FOR_ATTESTATION
|
||||
_product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION
|
||||
|
||||
# The resoure configuration options to use for this product.
|
||||
# Defines the ELF segment alignment for binaries (executables and shared libraries).
|
||||
# The ELF segment alignment has to be a PAGE_SIZE multiple. For example, if
|
||||
# PRODUCT_MAX_PAGE_SIZE_SUPPORTED=65536, the possible values for PAGE_SIZE could be
|
||||
# 4096, 16384 and 65536.
|
||||
_product_single_value_vars += PRODUCT_MAX_PAGE_SIZE_SUPPORTED
|
||||
|
||||
# The resource configuration options to use for this product.
|
||||
_product_list_vars += PRODUCT_LOCALES
|
||||
_product_list_vars += PRODUCT_AAPT_CONFIG
|
||||
_product_single_value_vars += PRODUCT_AAPT_PREF_CONFIG
|
||||
|
|
|
@ -156,6 +156,7 @@ $(call add_json_bool, Malloc_not_svelte, $(call invert_bool,$(fi
|
|||
$(call add_json_bool, Malloc_zero_contents, $(call invert_bool,$(filter false,$(MALLOC_ZERO_CONTENTS))))
|
||||
$(call add_json_bool, Malloc_pattern_fill_contents, $(MALLOC_PATTERN_FILL_CONTENTS))
|
||||
$(call add_json_str, Override_rs_driver, $(OVERRIDE_RS_DRIVER))
|
||||
$(call add_json_str, DeviceMaxPageSizeSupported, $(TARGET_MAX_PAGE_SIZE_SUPPORTED))
|
||||
|
||||
$(call add_json_bool, UncompressPrivAppDex, $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))))
|
||||
$(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
|
||||
|
|
Loading…
Reference in a new issue