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

Commit 25942751 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "16k: core: Remove page size limitation for setting... 

Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main am: 6c539c0d am: 3cf3f883

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



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

core/config.mk

+1 −7
Original line number Diff line number Diff line
@@ -419,16 +419,10 @@ else 
endif

.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED



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

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

# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.

TARGET_NO_BIONIC_PAGE_SIZE_MACRO := false

ifdef PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO

  TARGET_NO_BIONIC_PAGE_SIZE_MACRO := $(PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO)

  ifeq ($(TARGET_NO_BIONIC_PAGE_SIZE_MACRO),true)

      ifeq (,$(filter 16384 65536,$(TARGET_MAX_PAGE_SIZE_SUPPORTED)))

          $(error TARGET_MAX_PAGE_SIZE_SUPPORTED has to be either 16384 or 65536 to support page size agnostic)

      endif

  endif

endif

.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO

core/product.mk

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ _product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION 
# 4096, 16384 and 65536.

_product_single_value_vars += PRODUCT_MAX_PAGE_SIZE_SUPPORTED



# Indicates that AOSP can use a kernel configured with 4k/16k/64k page sizes.

# The possible values are true or false.

# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.

_product_single_value_vars += PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO



# The resource configuration options to use for this product.