commit f44951d3af6850c52845d10474795be6b097748a
author Vilas Bhat <vilasbhat@google.com> Mon Apr 15 17:32:27 2024 +0000
committer Vilas Bhat <vilasbhat@google.com> Mon Apr 15 21:45:08 2024 +0000
tree 5fe18785ddbd9247fb799291743797364719c39d
parent 8f9ca8075f90165f2a44b4d582cc85ae0be9fc72

16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets

This relands commit 35839ec1a33f0d2a314d7dc475bffc2cf3d3913c and also
includes `PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO` override for several
targets. The latter is required in order to fix failing tests due to
mismatch in the `VSR_VENDOR_API_LEVEL` value between test and device
targets.

Bug: 333124272
Bug: 310232825
Change-Id: I12db4b78b02aa4a58c7355852dc2ff5ae395592c

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