From aade89e9d03ca4e8cc4e0ffb8833b77805d4046e Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 29 May 2021 13:46:19 +0200 Subject: [PATCH] sm8350-common: Switch MDM remote fs symlinks to MSM Apparently 8350 has MSM baseband rather than MDM, who'd have thought? Change-Id: Ie70a0c5dce177f293ccc0ff1b46a642527f85549 --- Android.mk | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Android.mk b/Android.mk index 0ab5d91..ca8b4c7 100644 --- a/Android.mk +++ b/Android.mk @@ -42,49 +42,49 @@ $(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT) -RFS_MDM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/mdm/adsp/ -$(RFS_MDM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MDM ADSP folder structure: $@" +RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/adsp/ +$(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM ADSP folder structure: $@" @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/lpass $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/mdm/adsp $@/readwrite + $(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_MDM_CDSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/mdm/cdsp/ -$(RFS_MDM_CDSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MDM CDSP folder structure: $@" +RFS_MSM_CDSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/cdsp/ +$(RFS_MSM_CDSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM CDSP folder structure: $@" @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/cdsp $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/mdm/cdsp $@/readwrite + $(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_MDM_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/mdm/mpss/ -$(RFS_MDM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MDM MPSS folder structure: $@" +RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/mpss/ +$(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM MPSS folder structure: $@" @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/modem $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/mdm/mpss $@/readwrite + $(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_MDM_SLPI_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/mdm/slpi/ -$(RFS_MDM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MDM SLPI folder structure: $@" +RFS_MSM_SLPI_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/slpi/ +$(RFS_MSM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM SLPI folder structure: $@" @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/slpi $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/mdm/slpi $@/readwrite + $(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 @@ -111,5 +111,5 @@ $(VENDOR_RAMDISK_KERNEL_MODULES): $(INSTALLED_KERNEL_TARGET) $(INTERNAL_VENDOR_RAMDISK_TARGET): $(VENDOR_RAMDISK_KERNEL_MODULES) -ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MDM_ADSP_SYMLINKS) $(RFS_MDM_CDSP_SYMLINKS) $(RFS_MDM_MPSS_SYMLINKS) $(RFS_MDM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS) +ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS) endif