commit f5b6f07062e64fb1dfc5499bbec66eed94768e61
author Vilas Bhat <vilasbhat@google.com> Tue Apr 30 02:37:37 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 30 02:37:37 2024 +0000
tree 9b00ed368241b94958378f91087161f2df6455ef
parent 9cb8882df2a36c469e2f438ac340ba0d71a36a4c
parent cdc8605b959d5d7b0545b1a3a3176f68f81e84fc

Merge "16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets" into main

aosp_husky_pgagnostic.mk

diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk
index 0b10a4e..c005922 100644
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_pgagnostic.mk
@@ -16,10 +16,11 @@
 $(call inherit-product, device/google/shusky/aosp_husky.mk)
 
 PRODUCT_NAME := aosp_husky_pgagnostic
-PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF
+PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
+PRODUCT_16K_DEVELOPER_OPTION := true
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 

aosp_shiba_pgagnostic.mk

diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk
index 9d2434c..91a9992 100644
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_pgagnostic.mk
@@ -16,10 +16,11 @@
 $(call inherit-product, device/google/shusky/aosp_shiba.mk)
 
 PRODUCT_NAME := aosp_shiba_pgagnostic
-PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF
+PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
+PRODUCT_16K_DEVELOPER_OPTION := true
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4