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

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

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

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

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



Change-Id: I0eeca9e9b577b994853c5b7b01bf699d516a8bee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3de927e7 b0b9264f

core/config.mk

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