aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk38
-rwxr-xr-xmsm8996.mk3
2 files changed, 3 insertions, 38 deletions
diff --git a/Android.mk b/Android.mk
index 91a2620..94b7452 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,44 +65,6 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
-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_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
-
-ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS)
-
WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
$(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE)
@echo "WCNSS config ini link: $@"
diff --git a/msm8996.mk b/msm8996.mk
index 5240c1e..7dcd691 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -23,6 +23,9 @@
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_m.mk)
+# Add common definitions for Qualcomm
+$(call inherit-product, hardware/qcom-caf/common/common.mk)
+
# Get non-open-source specific aspects
$(call inherit-product, vendor/zuk/msm8996-common/msm8996-common-vendor.mk)