From ea9845fb4aa10ac6f48272c227959479e9ec0067 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 13 Jan 2025 11:03:38 +0200
Subject: [PATCH] sm8550-common: Migrate mount point creation out of Android.mk

Change-Id: Id5986b8a740e45f864eecdd2bd82d9455f128d6b
---
 Android.mk | 45 ---------------------------------------------
 common.mk  |  7 +++++++
 2 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 0acc7b1..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2023 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter dm1q dm2q dm3q,$(TARGET_DEVICE)),)
-
-# A/B builds require us to create the mount points at compile time.
-# Just creating it for all cases since it does not hurt.
-FIRMWARE_MODEM_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware-modem
-$(FIRMWARE_MODEM_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(FIRMWARE_MODEM_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/firmware-modem
-
-FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt
-$(FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(FIRMWARE_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
-
-BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware
-$(BT_FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(BT_FIRMWARE_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware
-
-DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp
-$(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(DSP_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/dsp
-
-VM_SYSTEM_MOUNT_POINT := $(TARGET_OUT_VENDOR)/vm-system
-$(VM_SYSTEM_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(VM_SYSTEM_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/vm-system
-
-ALL_DEFAULT_INSTALLED_MODULES += \
-    $(FIRMWARE_MODEM_MOUNT_POINT) \
-    $(FIRMWARE_MOUNT_POINT) \
-    $(BT_FIRMWARE_MOUNT_POINT) \
-    $(DSP_MOUNT_POINT) \
-    $(VM_SYSTEM_MOUNT_POINT)
-
-endif
diff --git a/common.mk b/common.mk
index 16c62ca..d77de9e 100644
--- a/common.mk
+++ b/common.mk
@@ -241,6 +241,13 @@ PRODUCT_PACKAGES += \
     WifiResTarget_spf
 
 # Partitions
+PRODUCT_PACKAGES += \
+    vendor_bt_firmware_mountpoint \
+    vendor_dsp_mountpoint \
+    vendor_firmware_mnt_mountpoint \
+    vendor_firmware-modem_mountpoint \
+    vendor_vm-system_mountpoint
+
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
 # Power