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

Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs." into main am: e74d66b42f am: 59d2fb49c7

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

Change-Id: Ic9f3a03a16501c8d2cb02dbfd336dfbc07fa2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Juan Yescas
2023-07-27 15:24:01 +00:00
committed by Automerger Merge Worker
parent 60e761b620 59d2fb49c7
commit 7563d87c89
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/config.mk
View File

@@ -436,11 +436,25 @@ else
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)
ifeq ($(TARGET_ARCH),arm64)
TARGET_MAX_PAGE_SIZE_SUPPORTED := 65536
endif
ifeq ($(TARGET_ARCH),arm)
TARGET_MAX_PAGE_SIZE_SUPPORTED := 65536
endif
endif
endif
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
# Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM arch.
ifneq ($(TARGET_MAX_PAGE_SIZE_SUPPORTED),4096)
ifneq ($(TARGET_ARCH),arm64)
ifneq ($(TARGET_ARCH),arm)
$(error TARGET_MAX_PAGE_SIZE_SUPPORTED=$(TARGET_MAX_PAGE_SIZE_SUPPORTED) is greater than 4096. Only supported in ARM arch)
endif
endif
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