commit 112a57658b082b67095a5c1e05d753b2ea7ce8fd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Apr 12 19:37:04 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 12 19:37:04 2024 +0000
tree f9809332aa5e71335209a31254bf14b25de84693
parent ef19738567bf3a051b915c277597bbe6bc49921d
parent 39dcf40403493df4b9c6d6d890d7196630d14527

Merge "16k: Enable `PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO` on aosp_arm64" into main

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e37f010..22ec292 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -422,7 +422,7 @@
 # Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.
 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)
+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

tools/aconfig/TEST_MAPPING

diff --git a/tools/aconfig/TEST_MAPPING b/tools/aconfig/TEST_MAPPING
index 638b92a..b7ff8ef 100644
--- a/tools/aconfig/TEST_MAPPING
+++ b/tools/aconfig/TEST_MAPPING
@@ -84,6 +84,10 @@
       "name": "aconfig_storage_write_api.test.rust"
     },
     {
+      // aconfig_storage write api cpp integration tests
+      "name": "aconfig_storage_write_api.test.cpp"
+    },
+    {
       // aconfig_storage read api rust integration tests
       "name": "aconfig_storage_read_api.test.rust"
     },
@@ -93,9 +97,5 @@
     }
   ],
   "postsubmit": [
-    {
-      // aconfig_storage write api cpp integration tests
-      "name": "aconfig_storage_write_api.test.cpp"
-    }
   ]
 }