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

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

Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than... 

Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs." into main am: e74d66b4 am: 59d2fb49

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



Change-Id: Ic9f3a03a16501c8d2cb02dbfd336dfbc07fa2a81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60e761b6 59d2fb49

core/config.mk

+14 −0
Original line number Diff line number Diff line
@@ -436,11 +436,25 @@ else 
  TARGET_MAX_PAGE_SIZE_SUPPORTED := 4096

  # When VSR vendor API level >= 34, binary alignment will be 65536.

  ifeq ($(call math_gt_or_eq,$(vsr_vendor_api_level),34),true)

    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.

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

  endif

endif



# Boolean variable determining if AOSP is page size agnostic. This means

# that AOSP can use a kernel configured with 4k/16k/64k PAGE SIZES.

TARGET_PAGE_SIZE_AGNOSTIC := false