From e36b02463af072ab28b5260b99d5faad5bef2ab7 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 15 Jan 2025 23:20:57 +0800
Subject: [PATCH] chiron: Migrate mount point creation out of Android.mk

Change-Id: Id5986b8a740e45f864eecdd2bd82d9455f128d6b
---
 Android.mk | 40 ----------------------------------------
 device.mk  |  6 ++++++
 2 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 1727456..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2017-2024 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),chiron)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-include $(CLEAR_VARS)
-
-# Bluetooth firmware mount point
-BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware
-$(BT_FIRMWARE_MOUNT_POINT):
-	@mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware
-ALL_DEFAULT_INSTALLED_MODULES += $(BT_FIRMWARE_MOUNT_POINT)
-
-# DSP mount point
-DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp
-$(DSP_MOUNT_POINT):
-	@mkdir -p $(TARGET_OUT_VENDOR)/dsp
-ALL_DEFAULT_INSTALLED_MODULES += $(DSP_MOUNT_POINT)
-
-# Modem firmware mount point
-MODEM_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt
-$(MODEM_FIRMWARE_MOUNT_POINT):
-	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
-ALL_DEFAULT_INSTALLED_MODULES += $(MODEM_FIRMWARE_MOUNT_POINT)
-endif
diff --git a/device.mk b/device.mk
index 61ced68..0632ad7 100644
--- a/device.mk
+++ b/device.mk
@@ -236,6 +236,12 @@ PRODUCT_PACKAGES += \
 # Overlay
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
+# Partitions
+PRODUCT_PACKAGES += \
+    vendor_bt_firmware_mountpoint \
+    vendor_dsp_mountpoint \
+    vendor_firmware_mnt_mountpoint
+
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \