From eb617e005bfdaa364f6417812d49324e14f6eb43 Mon Sep 17 00:00:00 2001
From: Juan Yescas <jyescas@google.com>
Date: Wed, 7 Aug 2024 13:04:17 -0700
Subject: [PATCH] 16kb: Add aosp_caimito_16k targets

Add the AOSP 16kb caimito targets:

- aosp_caiman_16k.mk
- aosp_komodo_16k.mk
- aosp_tokay_16k.mk

Bug: 346873199
Bug: 379162076
Test: $ source build/envsetup.sh
      $ lunch aosp_tokay_16k-trunk_staging-userdebug
      $ get_build_var PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
      true
      $ get_build_var PRODUCT_MAX_PAGE_SIZE_SUPPORTED

      $ get_build_var TARGET_BOOTS_16K
      true
      $ get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
      16384
      $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE
      ext4
      $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE
      ext4
      $ m
Flag: EXEMPT bugfix
Change-Id: I9ea2b41b0d6af8f86179f7e4007140181f06028a
Change-Id: I57bb6c667147789120ef5fbcf83baf130cb22fc2
Merged-In: I9ea2b41b0d6af8f86179f7e4007140181f06028a

Change-Id: I1e0ca3ce5323c901ebeb04f0a4b4bde47fe5e5de
---
 AndroidProducts.mk | 3 +++
 aosp_caiman_16k.mk | 7 +++++++
 aosp_komodo_16k.mk | 7 +++++++
 aosp_tokay_16k.mk  | 7 +++++++
 4 files changed, 24 insertions(+)
 create mode 100644 aosp_caiman_16k.mk
 create mode 100644 aosp_komodo_16k.mk
 create mode 100644 aosp_tokay_16k.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0390c151..4475c567 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,9 +16,11 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_caiman.mk \
+    $(LOCAL_DIR)/aosp_caiman_16k.mk \
     $(LOCAL_DIR)/aosp_caiman_fullmte.mk \
     $(LOCAL_DIR)/factory_caiman.mk \
     $(LOCAL_DIR)/aosp_komodo.mk \
+    $(LOCAL_DIR)/aosp_komodo_16k.mk \
     $(LOCAL_DIR)/aosp_komodo_fullmte.mk \
     $(LOCAL_DIR)/factory_komodo.mk \
     $(LOCAL_DIR)/aosp_ripcurrentpro.mk \
@@ -28,6 +30,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_ripcurrent24_fullmte.mk \
     $(LOCAL_DIR)/factory_ripcurrent24.mk \
     $(LOCAL_DIR)/aosp_tokay.mk \
+    $(LOCAL_DIR)/aosp_tokay_16k.mk \
     $(LOCAL_DIR)/aosp_tokay_fullmte.mk \
     $(LOCAL_DIR)/factory_tokay.mk
 COMMON_LUNCH_CHOICES := \
diff --git a/aosp_caiman_16k.mk b/aosp_caiman_16k.mk
new file mode 100644
index 00000000..34c68737
--- /dev/null
+++ b/aosp_caiman_16k.mk
@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_caiman.mk)
+
+PRODUCT_NAME := aosp_caiman_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true
diff --git a/aosp_komodo_16k.mk b/aosp_komodo_16k.mk
new file mode 100644
index 00000000..6333a486
--- /dev/null
+++ b/aosp_komodo_16k.mk
@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_komodo.mk)
+
+PRODUCT_NAME := aosp_komodo_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true
diff --git a/aosp_tokay_16k.mk b/aosp_tokay_16k.mk
new file mode 100644
index 00000000..17791dcc
--- /dev/null
+++ b/aosp_tokay_16k.mk
@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_tokay.mk)
+
+PRODUCT_NAME := aosp_tokay_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true