diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-27 20:14:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 20:14:54 +0000 |
| commit | 6c539c0d83c9064f8ec22582c1fff99e0f084677 (patch) | |
| tree | 6b6587e9c36380c53f89bbf428da2847cc30b9b0 | |
| parent | 2a9674af5828132bf887f6d0399d2a75f886135a (diff) | |
| parent | d3ad962cdc38d1125c8b5db83ca26f7775bfe203 (diff) | |
| download | build-6c539c0d83c9064f8ec22582c1fff99e0f084677.tar.gz | |
Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main
| -rw-r--r-- | core/config.mk | 8 | ||||
| -rw-r--r-- | core/product.mk | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/core/config.mk b/core/config.mk index c5df45c70f..daefa70f57 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 diff --git a/core/product.mk b/core/product.mk index d64dde2c68..01b5ead7db 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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. |