From 0c36b6ed9980574cb789dc96c33c47c20c282914 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sat, 6 Oct 2018 11:39:39 +0800 Subject: msm8996-common: Update symlinks for new mount points * Fix wrong SLPI ramdumps symlink and remove old BT firmware symlinks while at it Change-Id: I8fba4ea0a1af923f427b1ebb00ad86d6bbd81577 Signed-off-by: Davide Garberi --- Android.mk | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/Android.mk b/Android.mk index 1b62500..322f999 100644 --- a/Android.mk +++ b/Android.mk @@ -84,10 +84,10 @@ $(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 /persist/rfs/msm/adsp $@/readwrite - $(hide) ln -sf /persist/rfs/shared $@/shared - $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /firmware $@/readonly/firmware + $(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_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/mpss/ @@ -96,10 +96,10 @@ $(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 /persist/rfs/msm/mpss $@/readwrite - $(hide) ln -sf /persist/rfs/shared $@/shared - $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /firmware $@/readonly/firmware + $(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/ @@ -107,11 +107,11 @@ $(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/modem $@/ramdumps - $(hide) ln -sf /persist/rfs/msm/slpi $@/readwrite - $(hide) ln -sf /persist/rfs/shared $@/shared - $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /firmware $@/readonly/firmware + $(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 ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) @@ -138,18 +138,8 @@ $(WCNSS_MAC_SYMLINK): $(LOCAL_INSTALLED_MODULE) @echo "WCNSS MAC bin link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /persist/$(notdir $@) $@ + $(hide) ln -sf /mnt/vendor/persist/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) $(WCNSS_MAC_SYMLINK) -BT_FIRMWARE := btfw32.tlv btnv32.bin btnv32.b15 -BT_FIRMWARE_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(BT_FIRMWARE))) -$(BT_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating BT firmware symlink: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /bt_firmware/image/$(notdir $@) $@ - -ALL_DEFAULT_INSTALLED_MODULES += $(BT_FIRMWARE_SYMLINKS) - endif -- cgit v1.2.3