From 454ac9fb714d583a5fc6f4af77ef741f3bad29e6 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 3 Dec 2016 20:35:00 +0600 Subject: [PATCH] land: Rewrite build-time symlinks creation * Move tftp into Android.mk Change-Id: I86b9abbd87bb969db441dca80353fe563f18252f --- Android.mk | 24 +++++++++++++++++++++- tftp.mk | 59 ------------------------------------------------------ 2 files changed, 23 insertions(+), 60 deletions(-) delete mode 100644 tftp.mk diff --git a/Android.mk b/Android.mk index 969de92..0caa558 100644 --- a/Android.mk +++ b/Android.mk @@ -74,6 +74,28 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) -include device/xiaomi/land/tftp.mk +RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT)/rfs/msm/adsp/ +$(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM ADSP folder structure: $@" + @rm -rf $@/* + @mkdir -p $(dir $@)/readonly + $(hide) ln -sf /data/tombstones/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 + +RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT)/rfs/msm/mpss/ +$(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM MPSS folder structure: $@" + @rm -rf $@/* + @mkdir -p $(dir $@)/readonly + $(hide) ln -sf /data/tombstones/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 + +ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) endif diff --git a/tftp.mk b/tftp.mk deleted file mode 100644 index e810493..0000000 --- a/tftp.mk +++ /dev/null @@ -1,59 +0,0 @@ -######################################################################### -# Create Folder Structure -######################################################################### - -$(shell rm -rf $(TARGET_OUT)/rfs/) - -######################################################################### -# MSM Folders -######################################################################### -$(shell mkdir -p $(TARGET_OUT)/rfs/msm/mpss/readonly) -$(shell mkdir -p $(TARGET_OUT)/rfs/msm/adsp/readonly) - -$(shell ln -s /data/tombstones/modem $(TARGET_OUT)/rfs/msm/mpss/ramdumps) -$(shell ln -s /persist/rfs/msm/mpss $(TARGET_OUT)/rfs/msm/mpss/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/msm/mpss/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/msm/mpss/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/msm/mpss/readonly/firmware) - -$(shell ln -s /data/tombstones/lpass $(TARGET_OUT)/rfs/msm/adsp/ramdumps) -$(shell ln -s /persist/rfs/msm/adsp $(TARGET_OUT)/rfs/msm/adsp/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/msm/adsp/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/msm/adsp/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/msm/adsp/readonly/firmware) - -######################################################################### -# MDM Folders -######################################################################### -$(shell mkdir -p $(TARGET_OUT)/rfs/mdm/mpss/readonly) -$(shell mkdir -p $(TARGET_OUT)/rfs/mdm/adsp/readonly) -$(shell mkdir -p $(TARGET_OUT)/rfs/mdm/sparrow/readonly) - -$(shell ln -s /data/tombstones/modem $(TARGET_OUT)/rfs/mdm/mpss/ramdumps) -$(shell ln -s /persist/rfs/mdm/mpss $(TARGET_OUT)/rfs/mdm/mpss/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/mdm/mpss/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/mdm/mpss/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/mdm/mpss/readonly/firmware) - -$(shell ln -s /data/tombstones/lpass $(TARGET_OUT)/rfs/mdm/adsp/ramdumps) -$(shell ln -s /persist/rfs/mdm/adsp $(TARGET_OUT)/rfs/mdm/adsp/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/mdm/adsp/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/mdm/adsp/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/mdm/adsp/readonly/firmware) - -$(shell ln -s /data/tombstones/sparrow $(TARGET_OUT)/rfs/mdm/sparrow/ramdumps) -$(shell ln -s /persist/rfs/mdm/sparrow $(TARGET_OUT)/rfs/mdm/sparrow/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/mdm/sparrow/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/mdm/sparrow/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/mdm/sparrow/readonly/firmware) - -######################################################################### -# APQ Folders -######################################################################### -$(shell mkdir -p $(TARGET_OUT)/rfs/apq/gnss/readonly) - -$(shell ln -s /data/tombstones/modem $(TARGET_OUT)/rfs/apq/gnss/ramdumps) -$(shell ln -s /persist/rfs/apq/gnss $(TARGET_OUT)/rfs/apq/gnss/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/apq/gnss/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/apq/gnss/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/apq/gnss/readonly/firmware)