From 9c4da389cf8228d8d22699e18f22197044341066 Mon Sep 17 00:00:00 2001 From: bgcngm Date: Thu, 1 Aug 2024 06:48:54 +0200 Subject: [PATCH] stone: move to new RFS install_symlink targets Signed-off-by: Arijit78 --- Android.mk | 49 ------------------------------------------------- device.mk | 3 +++ 2 files changed, 3 insertions(+), 49 deletions(-) diff --git a/Android.mk b/Android.mk index 850a9f5..2dcc7d0 100644 --- a/Android.mk +++ b/Android.mk @@ -46,54 +46,6 @@ ALL_DEFAULT_INSTALLED_MODULES += $(BT_FIRMWARE_MOUNT_POINT) ALL_DEFAULT_INSTALLED_MODULES += $(DSP_MOUNT_POINT) ALL_DEFAULT_INSTALLED_MODULES += $(VM_SYSTEM_MOUNT_POINT) -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/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) - @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/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) - @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/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) - @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/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 - WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/ $(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Creating wifi firmware symlinks: $@" @@ -101,7 +53,6 @@ $(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini $(hide) ln -sf /mnt/vendor/persist/wlan_mac.bin $@/wlan_mac.bin -ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) ALL_DEFAULT_INSTALLED_MODULES += $(WIFI_FIRMWARE_SYMLINKS) # Symlinks diff --git a/device.mk b/device.mk index 3cead0e..984b2f2 100644 --- a/device.mk +++ b/device.mk @@ -18,6 +18,9 @@ endif # Enable project quotas and casefolding for emulated storage without sdcardfs $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) +# Add common definitions for Qualcomm +$(call inherit-product, hardware/qcom-caf/common/common.mk) + PRODUCT_SHIPPING_API_LEVEL := 30 # Device uses high-density artwork where available