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

Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac

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

Change-Id: I21608557356122b16c4589c8bd4359e4df351562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Juan Yescas 2023-08-14 17:59:39 +00:00 committed by Automerger Merge Worker
commit 6c8e80a8c2
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/config.mk
View file

@ -439,19 +439,14 @@ else
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.
# Only arm64 arch supports TARGET_MAX_PAGE_SIZE_SUPPORTED greater than 4096.
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
$(error TARGET_MAX_PAGE_SIZE_SUPPORTED=$(TARGET_MAX_PAGE_SIZE_SUPPORTED) is greater than 4096. Only supported in arm64 arch)
endif
endif