zenfone9: Move to new RFS install_symlink targets
Change-Id: I9560fd0da00958d9349a0881b5a5f64a2c02e495
diff --git a/Android.mk b/Android.mk
index f0d7120..75ddd5f 100755
--- a/Android.mk
+++ b/Android.mk
@@ -96,62 +96,6 @@
ALL_DEFAULT_INSTALLED_MODULES += $(ASUSFW_MOUNT_POINT) $(FACTORY_MOUNT_POINT_SYMLINK) $(XROM_MOUNT_POINT)
-RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/adsp/
-$(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @rm -rf $@/*
- @mkdir -p $(dir $@)/readonly/vendor
- $(hide) ln -sf /data/vendor/tombstones/rfs/lpass $@/ramdumps
- $(hide) ln -sf /mnt/vendor/persist/rfs/msm/adsp $@/readwrite
- $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
- $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
- $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
- $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-RFS_MSM_CDSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/cdsp/
-$(RFS_MSM_CDSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @rm -rf $@/*
- @mkdir -p $(dir $@)/readonly/vendor
- $(hide) ln -sf /data/vendor/tombstones/rfs/cdsp $@/ramdumps
- $(hide) ln -sf /mnt/vendor/persist/rfs/msm/cdsp $@/readwrite
- $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
- $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
- $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
- $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/mpss/
-$(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @rm -rf $@/*
- @mkdir -p $(dir $@)/readonly/vendor
- $(hide) ln -sf /data/vendor/tombstones/rfs/modem $@/ramdumps
- $(hide) ln -sf /mnt/vendor/persist/rfs/msm/mpss $@/readwrite
- $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
- $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
- $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
- $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-RFS_MSM_SLPI_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/slpi/
-$(RFS_MSM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @rm -rf $@/*
- @mkdir -p $(dir $@)/readonly/vendor
- $(hide) ln -sf /data/vendor/tombstones/rfs/slpi $@/ramdumps
- $(hide) ln -sf /mnt/vendor/persist/rfs/msm/slpi $@/readwrite
- $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
- $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
- $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
- $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-RFS_MSM_WPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/wpss/
-$(RFS_MSM_WPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @echo "Creating RFS MSM WPSS folder structure: $@"
- @rm -rf $@/*
- @mkdir -p $(dir $@)/readonly/vendor
- $(hide) ln -sf /data/vendor/tombstones/rfs/wpss $@/ramdumps
- $(hide) ln -sf /mnt/vendor/persist/rfs/msm/wpss $@/readwrite
- $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
- $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
- $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
- $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@echo "Creating WiFi firmware symlinks: $@"
@@ -160,11 +104,6 @@
$(hide) ln -sf /vendor/firmware/wlan/qca_cld/qca6490/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
ALL_DEFAULT_INSTALLED_MODULES += \
- $(RFS_MSM_ADSP_SYMLINKS) \
- $(RFS_MSM_CDSP_SYMLINKS) \
- $(RFS_MSM_MPSS_SYMLINKS) \
- $(RFS_MSM_SLPI_SYMLINKS) \
- $(RFS_MSM_WPSS_SYMLINKS) \
$(WIFI_FIRMWARE_SYMLINKS)
endif
diff --git a/omni_zenfone9.mk b/omni_zenfone9.mk
index c485116..5d40271 100644
--- a/omni_zenfone9.mk
+++ b/omni_zenfone9.mk
@@ -26,6 +26,9 @@
# Get the prebuilt list of APNs
$(call inherit-product, vendor/omni/config/gsm.mk)
+# Add common definitions for Qualcomm
+$(call inherit-product, vendor/omni/qcom/common.mk)
+
# Inherit from the common Open Source product configuration
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)