tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "update-no-bionic-page-size" into main

Browse source 
* changes:
  16k: core: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro
  16k: core: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
This commit is contained in:
Vilas Bhat 2023-12-06 13:16:19 +00:00 committed by Gerrit Code Review
commit f28fa571d0
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/config.mk
View file

@ -436,16 +436,16 @@ endif
# Boolean variable determining if AOSP is page size agnostic. This means
# that AOSP can use a kernel configured with 4k/16k/64k PAGE SIZES.
TARGET_PAGE_SIZE_AGNOSTIC := false
ifdef PRODUCT_PAGE_SIZE_AGNOSTIC
TARGET_PAGE_SIZE_AGNOSTIC := $(PRODUCT_PAGE_SIZE_AGNOSTIC)
ifeq ($(TARGET_PAGE_SIZE_AGNOSTIC),true)
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := false
ifdef PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := $(PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO)
ifeq ($(TARGET_NO_BIONIC_PAGE_SIZE_MACRO),true)
ifneq ($(TARGET_MAX_PAGE_SIZE_SUPPORTED),65536)
$(error TARGET_MAX_PAGE_SIZE_SUPPORTED has to be 65536 to support page size agnostic)
endif
endif
endif
.KATI_READONLY := TARGET_PAGE_SIZE_AGNOSTIC
.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO
# Pruned directory options used when using findleaves.py
# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS

2
core/product.mk
View file

@ -35,7 +35,7 @@ _product_single_value_vars += PRODUCT_MAX_PAGE_SIZE_SUPPORTED
# Indicates that AOSP can use a kernel configured with 4k/16k/64k page sizes.
# The possible values are true or false.
_product_single_value_vars += PRODUCT_PAGE_SIZE_AGNOSTIC
_product_single_value_vars += PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
# The resource configuration options to use for this product.
_product_list_vars += PRODUCT_LOCALES

2
core/soong_config.mk
View file

@ -159,7 +159,7 @@ $(call add_json_bool, Malloc_zero_contents, $(call invert_bool,$(fi
$(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, DevicePageSizeAgnostic, $(filter true,$(TARGET_PAGE_SIZE_AGNOSTIC)))
$(call add_json_bool, DeviceNoBionicPageSizeMacro, $(filter true,$(TARGET_NO_BIONIC_PAGE_SIZE_MACRO)))
$(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))