commit 927a2293bcba1d5732f1ba026fad1d25b05b38b6
author Stephen Ho <stephenhou@google.com> Mon Apr 08 04:29:07 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 08 04:29:07 2024 +0000
tree 417ce4393d3e38b064d9369a9497c8ade7c00d58
parent 44f8debe2a60566cb783dfe815145759c6a7b513
parent 6cc2ee7a6d6fa4bad105bdf1187ade9c680b819f

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

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

Change-Id: I38be83ea99253358524c1127805eb5e3d0f1fd2a
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 22ec292..daefa70 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -420,12 +420,9 @@
 .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