commit 6cc2ee7a6d6fa4bad105bdf1187ade9c680b819f
author Stephen Ho <stephenhou@google.com> Mon Apr 08 04:06:44 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 08 04:06:44 2024 +0000
tree c38813df8b175d9d344a45d1fc6d002cb95ba3f5
parent 667f4ac52839c5968ed6808e4fd51e8691613884
parent 31971fb99e1991e426af333fec98d322a80888c8

Merge "Revert "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 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