commit 44f8debe2a60566cb783dfe815145759c6a7b513
author Vilas Bhat <vilasbhat@google.com> Fri Apr 05 20:23:49 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 05 20:23:49 2024 +0000
tree bd09ff35b67e04f6d31a3cef8b5b98ebab63cedf
parent f15dadb4217c01e4a9b3a2adffc61b672c109910
parent 667f4ac52839c5968ed6808e4fd51e8691613884

Merge "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main am: 667f4ac528

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

Change-Id: I3e757bb7559b24a86a4d684872295594d4f63b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index daefa70..22ec292 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -420,9 +420,12 @@
 .KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
 
 # 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)
+else ifeq ($(call math_lt,$(VSR_VENDOR_API_LEVEL),35),true)
+  TARGET_NO_BIONIC_PAGE_SIZE_MACRO := false
+else
+  TARGET_NO_BIONIC_PAGE_SIZE_MACRO := true
 endif
 .KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO