commit 85bd1e671ed7489c2a0139c6550bf0da2da55f7e
author Vilas Bhat <vilasbhat@google.com> Fri Mar 29 23:57:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 29 23:57:23 2024 +0000
tree f224b3a97c73f6afddeb8c337be4d500add319a6
parent d3df8b5b06bd152bbc7ecee8a6730aac5c70598c
parent 90141637174dadd92810a5365ee8ce22164344cf

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

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index daefa70..e37f010 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),34),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