Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b51f6ec authored by Juan Yescas's avatar Juan Yescas Committed by Automerger Merge Worker
Browse files

Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c4 

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



Change-Id: Iaaa88ab3fa7c6302008b04c5400dbdf099697ff3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d1abfed 06b7b6c4

core/config.mk

+3 −3
Original line number Diff line number Diff line
@@ -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