commit 35839ec1a33f0d2a314d7dc475bffc2cf3d3913c
author Vilas Bhat <vilasbhat@google.com> Thu Apr 11 21:34:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 11 21:34:08 2024 +0000
tree f224b3a97c73f6afddeb8c337be4d500add319a6
parent 5c2956897cf365d67f53822101500fbbaa70d2fb

Revert^2 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"

This reverts commit 5c2956897cf365d67f53822101500fbbaa70d2fb.

Reason for revert: Fixed the breaking tests on `aosp_cf_x86_64` target.

Change-Id: I7179b4615985f4f85b26ebe5ce099ee4899bb415
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825

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