Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 am: 1b51f6ec38 am: 3675aaf529

Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: I50ddf4ac601625bf71cb7df4b1f0fd20f78c965f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Juan Yescas 2023-11-10 00:47:13 +00:00 committed by Automerger Merge Worker
commit 1ed28d0a07

View file

@ -427,10 +427,10 @@ else
endif
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
# Only arm64 arch supports TARGET_MAX_PAGE_SIZE_SUPPORTED greater than 4096.
# Only arm64 and x86_64 archs supports TARGET_MAX_PAGE_SIZE_SUPPORTED greater than 4096.
ifneq ($(TARGET_MAX_PAGE_SIZE_SUPPORTED),4096)
ifneq ($(TARGET_ARCH),arm64)
$(error TARGET_MAX_PAGE_SIZE_SUPPORTED=$(TARGET_MAX_PAGE_SIZE_SUPPORTED) is greater than 4096. Only supported in arm64 arch)
ifeq (,$(filter arm64 x86_64,$(TARGET_ARCH)))
$(error TARGET_MAX_PAGE_SIZE_SUPPORTED=$(TARGET_MAX_PAGE_SIZE_SUPPORTED) is greater than 4096. Only supported in arm64 and x86_64 archs)
endif
endif