StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main am: 6c539c0d83

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3014513

Change-Id: I568f7950310e8ab0b16ccd1cb21f2f59e6667976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-03-27 20:30:45 +00:00
committed by Automerger Merge Worker
parent 964668d4c7 6c539c0d83
commit 3cf3f883f9
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/config.mk
View File

@@ -419,16 +419,10 @@ else
endif
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
# Boolean variable determining if AOSP is page size agnostic. This means
# that AOSP can use a kernel configured with 4k/16k/64k PAGE SIZES.
# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.
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)
ifeq (,$(filter 16384 65536,$(TARGET_MAX_PAGE_SIZE_SUPPORTED)))
$(error TARGET_MAX_PAGE_SIZE_SUPPORTED has to be either 16384 or 65536 to support page size agnostic)
endif
endif
endif
.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO

3
core/product.mk
View File

@@ -33,8 +33,7 @@ _product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION
# 4096, 16384 and 65536.
_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.
# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.
_product_single_value_vars += PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
# The resource configuration options to use for this product.