From a53ff0266d315be8e15c4a6a994569e1749a6c01 Mon Sep 17 00:00:00 2001
From: Nicholas Andrew <BOBtheBlinker@gMail.com>
Date: Tue, 15 Sep 2026 19:19:43 -0400
Subject: [PATCH 1/4] milanf: suppress SCM kernel localversion suffix

---
 BoardConfig.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e5a40b6..cb302ac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -52,3 +52,6 @@ BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 25
 
 # inherit from the proprietary version
 include vendor/motorola/milanf/BoardConfigVendor.mk
+
+# Keep exact branded kernel release; suppress SCM "+" suffix
+TARGET_KERNEL_ADDITIONAL_FLAGS += LOCALVERSION=

From 9f7e5ba258aa64095a98385377582752a84f4425 Mon Sep 17 00:00:00 2001
From: Nicholas Andrew <BOBtheBlinker@gMail.com>
Date: Tue, 15 Sep 2026 19:23:01 -0400
Subject: [PATCH 2/4] milanf: adapt device configuration for BlissROM 20

---
 AndroidProducts.mk                               |  2 +-
 lineage_milanf.mk => bliss_milanf.mk             | 16 +++++++++++++---
 .../apps/Settings/res/values/bliss_strings.xml   |  5 +++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 rename lineage_milanf.mk => bliss_milanf.mk (67%)
 create mode 100644 overlay/packages/apps/Settings/res/values/bliss_strings.xml

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9f3d059..6f7a596 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -4,4 +4,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_milanf.mk
+    $(LOCAL_DIR)/bliss_milanf.mk
diff --git a/lineage_milanf.mk b/bliss_milanf.mk
similarity index 67%
rename from lineage_milanf.mk
rename to bliss_milanf.mk
index 66e1a59..c623857 100644
--- a/lineage_milanf.mk
+++ b/bliss_milanf.mk
@@ -11,10 +11,17 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from milanf device
 $(call inherit-product, device/motorola/milanf/device.mk)
 
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common BlissROM stuff.
+$(call inherit-product, vendor/bliss/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_milanf
+# Maintainer Overlay
+PRODUCT_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+# GMS Package Variant (can handle pico, nano, micro, full)
+TARGET_GAPPS_VARIANT := full
+GAPPS_ARCH := arm64
+
+PRODUCT_NAME := bliss_milanf
 PRODUCT_DEVICE := milanf
 PRODUCT_MANUFACTURER := motorola
 PRODUCT_BRAND := motorola
@@ -26,3 +33,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildDesc="milanf_g-user 13 T2SDS33.75-38-1-3-26 e35d9-fa7d4 release-keys" \
     BuildFingerprint=motorola/milanf_g/milanf:13/T2SDS33.75-38-1-3-26/e35d9-fa7d4:user/release-keys \
     DeviceProduct=milanf_g
+
+# A-Team signing configuration
+$(call inherit-product, vendor/ateam/android.mk)
diff --git a/overlay/packages/apps/Settings/res/values/bliss_strings.xml b/overlay/packages/apps/Settings/res/values/bliss_strings.xml
new file mode 100644
index 0000000..5752035
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/bliss_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="maintainer">BOBtheBlinker</string>
+    <string name="bliss_maintainer">BOBtheBlinker</string>
+</resources>

From 77df5d73a514fd70171dd2df0f536baf61021053 Mon Sep 17 00:00:00 2001
From: Nicholas Andrew <BOBtheBlinker@gMail.com>
Date: Thu, 17 Sep 2026 22:12:36 -0400
Subject: [PATCH 3/4] milanf: Remove private signing configuration

---
 bliss_milanf.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bliss_milanf.mk b/bliss_milanf.mk
index c623857..c58cd3a 100644
--- a/bliss_milanf.mk
+++ b/bliss_milanf.mk
@@ -33,6 +33,3 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildDesc="milanf_g-user 13 T2SDS33.75-38-1-3-26 e35d9-fa7d4 release-keys" \
     BuildFingerprint=motorola/milanf_g/milanf:13/T2SDS33.75-38-1-3-26/e35d9-fa7d4:user/release-keys \
     DeviceProduct=milanf_g
-
-# A-Team signing configuration
-$(call inherit-product, vendor/ateam/android.mk)

From 9f63c9176dac9bcf90a72c2dc955d0e8285f77ff Mon Sep 17 00:00:00 2001
From: BOBtheBlinker <61356073+BobTheBlinker@users.noreply.github.com>
Date: Thu, 24 Sep 2026 23:46:39 -0400
Subject: [PATCH 4/4] milanf: gms cleanup

Removed GMS Package Variant setting from the makefile.
---
 bliss_milanf.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bliss_milanf.mk b/bliss_milanf.mk
index c58cd3a..5191696 100644
--- a/bliss_milanf.mk
+++ b/bliss_milanf.mk
@@ -17,8 +17,7 @@ $(call inherit-product, vendor/bliss/config/common_full_phone.mk)
 # Maintainer Overlay
 PRODUCT_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
-# GMS Package Variant (can handle pico, nano, micro, full)
-TARGET_GAPPS_VARIANT := full
+# MindTheGapps Architecture
 GAPPS_ARCH := arm64
 
 PRODUCT_NAME := bliss_milanf