zenfone9: Switch to qcom common {symlink|mkdir} module for mountpoint creation
Change-Id: I498127983fc14de1e30e177ec5782e01cfc4ead1
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/Android.bp b/Android.bp
index b36f74a..f4bdd75 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,3 +36,15 @@
installed_location: "firmware/wlan/qca_cld/qca6490/WCNSS_qcom_cfg.ini",
symlink_target: "/vendor/etc/wifi/WCNSS_qcom_cfg.ini",
}
+
+mkdir {
+ name: "vendor_asusfw_mountpoint",
+ dir: "asusfw",
+ vendor: true,
+}
+
+mkdir {
+ name: "vendor_xrom_mountpoint",
+ dir: "xrom",
+ vendor: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100755
index 469452b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2016 The CyanogenMod 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.
-#
-
-#
-# This contains the module build definitions for the hardware-specific
-# components for this device.
-#
-# As much as possible, those components should be built unconditionally,
-# with device-specific names to avoid collisions, to avoid device-specific
-# bitrot and build breakages. Building a component unconditionally does
-# *not* include it on all devices, so it is safe even with hardware-specific
-# components.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone9))
-
-include $(CLEAR_VARS)
-
-# 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_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
-
-ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
-
-ASUSFW_MOUNT_POINT := $(TARGET_OUT_VENDOR)/asusfw
-$(ASUSFW_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
- @echo "Creating $(ASUSFW_MOUNT_POINT)"
- @mkdir -p $(TARGET_OUT_VENDOR)/asusfw
-
-XROM_MOUNT_POINT := $(TARGET_OUT_VENDOR)/xrom
-$(XROM_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
- @echo "Creating $(XROM_MOUNT_POINT)"
- @mkdir -p $(TARGET_OUT_VENDOR)/xrom
-
-ALL_DEFAULT_INSTALLED_MODULES += $(ASUSFW_MOUNT_POINT) $(XROM_MOUNT_POINT)
-
-endif
diff --git a/device.mk b/device.mk
index b2d0714..bb4562d 100755
--- a/device.mk
+++ b/device.mk
@@ -246,7 +246,11 @@
# Mount Point symlink
PRODUCT_PACKAGES += \
- mnt_point_factory_symlink
+ mnt_point_factory_symlink \
+ vendor_asusfw_mountpoint \
+ vendor_bt_firmware_mountpoint \
+ vendor_xrom_mountpoint \
+ vendor_firmware_mnt_mountpoint
# NFC
PRODUCT_PACKAGES += \