diff options
| author | Vilas Bhat <vilasbhat@google.com> | 2024-03-25 02:02:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-25 02:02:09 +0000 |
| commit | 160357160b25dfc9e881512224fc62526c6cb71f (patch) | |
| tree | dd11ccb3cfac78115cce0f1af31aca2fa7ca2aef | |
| parent | 3903154c64bf30a9bb2eede2f96d8d55b050da76 (diff) | |
| parent | 8c85199efecceb6345a0afa19e5268244efd957f (diff) | |
| download | build-160357160b25dfc9e881512224fc62526c6cb71f.tar.gz | |
Merge "16k: core: Change default TARGET_MAX_PAGE_SIZE_SUPPORTED to 16384" into main
| -rw-r--r-- | core/config.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index d7516d337a..c109b1c1b0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -413,7 +413,7 @@ else # 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 + TARGET_MAX_PAGE_SIZE_SUPPORTED := 16384 endif endif endif @@ -432,8 +432,8 @@ 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) - ifneq ($(TARGET_MAX_PAGE_SIZE_SUPPORTED),65536) - $(error TARGET_MAX_PAGE_SIZE_SUPPORTED has to be 65536 to support page size agnostic) + 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 |