From 24b02ed7245e990224a9ae493828ab3526a9354d Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Fri, 11 Aug 2023 11:50:28 -0700 Subject: [PATCH] core: ARM 32-bit targets must be built with 4k elf alignment - ARM 32-bit targets will be built with 4096 ELF alignment. - ARM 32-bit targets will only support 4K Page sizes. - ARM 32-bit targets won't be page agnostic. Test: source build/envsetup.sh lunch aosp_cf_x86_64_phone m Bug: 295550555 Change-Id: I1fda20ee06759cfe30e2e244616456d1ffa5ad66 --- core/config.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/config.mk b/core/config.mk index e919be3470..2a30dd92a3 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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