omni: Use the new Qcom defs from hardware/qcom-caf/common
Change-Id: Ib99ab3255248880f1b1128eace3135904c9dd7db
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 74d7937..c764faf 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -12,6 +12,8 @@
$(call project-set-path,qcom-$(2),$(strip $(path)))
endef
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+
$(call set-device-specific-path,AUDIO,audio,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/audio)
$(call set-device-specific-path,DISPLAY,display,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/display)
$(call set-device-specific-path,MEDIA,media,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/media)
@@ -21,3 +23,12 @@
$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices)
$(call set-device-specific-path,VR,vr,hardware/qcom-caf/vr)
$(call set-device-specific-path,WLAN,wlan,hardware/qcom-caf/wlan)
+
+# Wlan AOSP guard
+TARGET_USES_HARDWARE_QCOM_WLAN := false
+
+# Wlan Qcom Guard
+PRODUCT_CFI_INCLUDE_PATHS += \
+ hardware/qcom-caf/wlan/qcwcn/wpa_supplicant_8_lib
+
+endif
diff --git a/config/BoardConfigOmni.mk b/config/BoardConfigOmni.mk
index 095ff8c..6f3f929 100644
--- a/config/BoardConfigOmni.mk
+++ b/config/BoardConfigOmni.mk
@@ -3,7 +3,7 @@
endif
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-include vendor/omni/config/BoardConfigQcom.mk
+include hardware/qcom-caf/common/BoardConfigQcom.mk
endif
include vendor/omni/config/BoardConfigSoong.mk
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
deleted file mode 100644
index 9adc7b2..0000000
--- a/config/BoardConfigQcom.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-# Board platforms lists to be used for
-# TARGET_BOARD_PLATFORM specific featurization
-QCOM_BOARD_PLATFORMS := msm7627_surf
-QCOM_BOARD_PLATFORMS += msm7627_6x
-QCOM_BOARD_PLATFORMS += msm7627a
-QCOM_BOARD_PLATFORMS += msm7630_surf
-QCOM_BOARD_PLATFORMS += msm7630_fusion
-QCOM_BOARD_PLATFORMS += msm8226
-QCOM_BOARD_PLATFORMS += msm8660
-QCOM_BOARD_PLATFORMS += msm8909
-QCOM_BOARD_PLATFORMS += msm8916
-QCOM_BOARD_PLATFORMS += msm8939
-QCOM_BOARD_PLATFORMS += msm8937
-QCOM_BOARD_PLATFORMS += msm8952
-QCOM_BOARD_PLATFORMS += msm8953
-QCOM_BOARD_PLATFORMS += msm8960
-QCOM_BOARD_PLATFORMS += msm8974
-QCOM_BOARD_PLATFORMS += msm8992
-QCOM_BOARD_PLATFORMS += msm8994
-QCOM_BOARD_PLATFORMS += msm8996
-QCOM_BOARD_PLATFORMS += msm8998
-QCOM_BOARD_PLATFORMS += apq8084
-QCOM_BOARD_PLATFORMS += sdm660
-QCOM_BOARD_PLATFORMS += sdm710
-QCOM_BOARD_PLATFORMS += sdm845
-QCOM_BOARD_PLATFORMS += sm8150
-QCOM_BOARD_PLATFORMS += msmnile
-QCOM_BOARD_PLATFORMS += kona
-QCOM_BOARD_PLATFORMS += sm6150
-QCOM_BOARD_PLATFORMS += sm8250
-QCOM_BOARD_PLATFORMS += lahaina
-QCOM_BOARD_PLATFORMS += sm8350
-QCOM_BOARD_PLATFORMS += taro
-
-MSM7K_BOARD_PLATFORMS := msm7630_surf
-MSM7K_BOARD_PLATFORMS += msm7630_fusion
-MSM7K_BOARD_PLATFORMS += msm7627_surf
-MSM7K_BOARD_PLATFORMS += msm7627_6x
-MSM7K_BOARD_PLATFORMS += msm7627a
-MSM7K_BOARD_PLATFORMS += msm7k
-
-QSD8K_BOARD_PLATFORMS := qsd8k
-
-# Target-specific configuration
-qcom_flags := -DQCOM_HARDWARE
-ifeq ($(TARGET_USES_QCOM_BSP),true)
- qcom_flags += -DQCOM_BSP
- qcom_flags += -DQTI_BSP
-endif
-
-PRIVATE_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-PRIVATE_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-
-TARGET_COMPILE_WITH_MSM_KERNEL := true
-MSM_VIDC_TARGET_LIST := \
- msm8974 \
- msm8610 \
- msm8226 \
- apq8084 \
- msm8916 \
- msm8937 \
- msm8952 \
- msm8953 \
- msm8994 \
- msm8909 \
- msm8992 \
- msm8996 \
- msm8998 \
- sdm660 \
- sdm710 \
- sdm845 \
- sm8150 \
- msmnile \
- sm6150 \
- kona
-
-# Gralloc Usage Bits
-TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := (1 << 13) | (1 << 21) | (1 << 27)
-
-# Wlan AOSP guard
-TARGET_USES_HARDWARE_QCOM_WLAN := false
-
-# Wlan Qcom Guard
-PRODUCT_CFI_INCLUDE_PATHS += \
- hardware/qcom-caf/wlan/qcwcn/wpa_supplicant_8_lib
-
-PRODUCT_SOONG_NAMESPACES += hardware/qcom-caf/wlan
-
-# Qcom Display
-PRODUCT_SOONG_NAMESPACES += \
- vendor/qcom/opensource/commonsys/display \
- vendor/qcom/opensource/commonsys-intf/display
-
-SOONG_CONFIG_omniQcomVars += \
- qcom_display_headers_namespace
-SOONG_CONFIG_omniQcomVars_qcom_display_headers_namespace := vendor/qcom/opensource/commonsys-intf/display
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 95a51dd..4d62896 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -62,6 +62,12 @@
supports_hw_fde \
supports_hw_fde_perf
+# Only create display_headers_namespace var if dealing with UM platforms to avoid breaking build for all other platforms
+ifneq ($(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
+SOONG_CONFIG_omniQcomVars += \
+ qcom_display_headers_namespace
+endif
+
# Soong bool variables
SOONG_CONFIG_omniQcomVars_healthd_enable_tricolor_led := $(HEALTHD_ENABLE_TRICOLOR_LED)
SOONG_CONFIG_omniQcomVars_supports_extended_compress_format := $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)
@@ -111,6 +117,12 @@
SOONG_CONFIG_omniGlobalVars_target_init_vendor_lib := $(TARGET_INIT_VENDOR_LIB)
SOONG_CONFIG_omniGlobalVars_target_surfaceflinger_udfps_lib := $(TARGET_SURFACEFLINGER_UDFPS_LIB)
+ifneq ($(filter $(QSSI_SUPPORTED_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
+SOONG_CONFIG_omniQcomVars_qcom_display_headers_namespace := vendor/qcom/opensource/commonsys-intf/display
+else
+SOONG_CONFIG_omniQcomVars_qcom_display_headers_namespace := $(QCOM_SOONG_NAMESPACE)/display
+endif
+
ifeq ($(ROM_BUILDTYPE),GAPPS)
SOONG_CONFIG_omniGlobalVars_launcher3Gapps := true
else
diff --git a/qcom/Android.bp b/qcom/Android.bp
deleted file mode 100644
index f5c176a..0000000
--- a/qcom/Android.bp
+++ /dev/null
@@ -1,508 +0,0 @@
-//
-// Copyright (C) 2022-2024 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-install_symlink {
- name: "rfs_apq_gnss_hlos_symlink",
- vendor: true,
- installed_location: "rfs/apq/gnss/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_apq_gnss_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/apq/gnss/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/modem",
-}
-
-install_symlink {
- name: "rfs_apq_gnss_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/apq/gnss/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_apq_gnss_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/apq/gnss/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_apq_gnss_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/apq/gnss/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/apq/gnss",
-}
-
-install_symlink {
- name: "rfs_apq_gnss_shared_symlink",
- vendor: true,
- installed_location: "rfs/apq/gnss/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_adsp_hlos_symlink",
- vendor: true,
- installed_location: "rfs/mdm/adsp/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_adsp_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/mdm/adsp/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/lpass",
-}
-
-install_symlink {
- name: "rfs_mdm_adsp_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/adsp/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_mdm_adsp_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/adsp/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_mdm_adsp_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/mdm/adsp/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/mdm/adsp",
-}
-
-install_symlink {
- name: "rfs_mdm_adsp_shared_symlink",
- vendor: true,
- installed_location: "rfs/mdm/adsp/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_cdsp_hlos_symlink",
- vendor: true,
- installed_location: "rfs/mdm/cdsp/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_cdsp_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/mdm/cdsp/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/cdsp",
-}
-
-install_symlink {
- name: "rfs_mdm_cdsp_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/cdsp/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_mdm_cdsp_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/cdsp/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_mdm_cdsp_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/mdm/cdsp/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/mdm/cdsp",
-}
-
-install_symlink {
- name: "rfs_mdm_cdsp_shared_symlink",
- vendor: true,
- installed_location: "rfs/mdm/cdsp/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_mpss_hlos_symlink",
- vendor: true,
- installed_location: "rfs/mdm/mpss/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_mpss_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/mdm/mpss/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/modem",
-}
-
-install_symlink {
- name: "rfs_mdm_mpss_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/mpss/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_mdm_mpss_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/mpss/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_mdm_mpss_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/mdm/mpss/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/mdm/mpss",
-}
-
-install_symlink {
- name: "rfs_mdm_mpss_shared_symlink",
- vendor: true,
- installed_location: "rfs/mdm/mpss/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_slpi_hlos_symlink",
- vendor: true,
- installed_location: "rfs/mdm/slpi/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_slpi_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/mdm/slpi/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/slpi",
-}
-
-install_symlink {
- name: "rfs_mdm_slpi_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/slpi/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_mdm_slpi_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/slpi/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_mdm_slpi_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/mdm/slpi/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/mdm/slpi",
-}
-
-install_symlink {
- name: "rfs_mdm_slpi_shared_symlink",
- vendor: true,
- installed_location: "rfs/mdm/slpi/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_tn_hlos_symlink",
- vendor: true,
- installed_location: "rfs/mdm/tn/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_tn_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/mdm/tn/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/tn",
-}
-
-install_symlink {
- name: "rfs_mdm_tn_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/tn/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_mdm_tn_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/tn/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_mdm_tn_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/mdm/tn/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/mdm/tn",
-}
-
-install_symlink {
- name: "rfs_mdm_tn_shared_symlink",
- vendor: true,
- installed_location: "rfs/mdm/tn/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_wpss_hlos_symlink",
- vendor: true,
- installed_location: "rfs/mdm/wpss/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_mdm_wpss_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/mdm/wpss/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/wpss",
-}
-
-install_symlink {
- name: "rfs_mdm_wpss_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/wpss/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_mdm_wpss_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/mdm/wpss/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_mdm_wpss_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/mdm/wpss/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/mdm/wpss",
-}
-
-install_symlink {
- name: "rfs_mdm_wpss_shared_symlink",
- vendor: true,
- installed_location: "rfs/mdm/wpss/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_adsp_hlos_symlink",
- vendor: true,
- installed_location: "rfs/msm/adsp/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_adsp_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/msm/adsp/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/lpass",
-}
-
-install_symlink {
- name: "rfs_msm_adsp_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/adsp/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_msm_adsp_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/adsp/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_msm_adsp_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/msm/adsp/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/msm/adsp",
-}
-
-install_symlink {
- name: "rfs_msm_adsp_shared_symlink",
- vendor: true,
- installed_location: "rfs/msm/adsp/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_cdsp_hlos_symlink",
- vendor: true,
- installed_location: "rfs/msm/cdsp/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_cdsp_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/msm/cdsp/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/cdsp",
-}
-
-install_symlink {
- name: "rfs_msm_cdsp_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/cdsp/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_msm_cdsp_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/cdsp/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_msm_cdsp_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/msm/cdsp/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/msm/cdsp",
-}
-
-install_symlink {
- name: "rfs_msm_cdsp_shared_symlink",
- vendor: true,
- installed_location: "rfs/msm/cdsp/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_mpss_hlos_symlink",
- vendor: true,
- installed_location: "rfs/msm/mpss/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_mpss_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/msm/mpss/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/modem",
-}
-
-install_symlink {
- name: "rfs_msm_mpss_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/mpss/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_msm_mpss_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/mpss/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_msm_mpss_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/msm/mpss/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/msm/mpss",
-}
-
-install_symlink {
- name: "rfs_msm_mpss_shared_symlink",
- vendor: true,
- installed_location: "rfs/msm/mpss/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_slpi_hlos_symlink",
- vendor: true,
- installed_location: "rfs/msm/slpi/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_slpi_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/msm/slpi/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/slpi",
-}
-
-install_symlink {
- name: "rfs_msm_slpi_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/slpi/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_msm_slpi_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/slpi/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_msm_slpi_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/msm/slpi/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/msm/slpi",
-}
-
-install_symlink {
- name: "rfs_msm_slpi_shared_symlink",
- vendor: true,
- installed_location: "rfs/msm/slpi/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_wpss_hlos_symlink",
- vendor: true,
- installed_location: "rfs/msm/wpss/hlos",
- symlink_target: "/mnt/vendor/persist/hlos_rfs/shared",
-}
-
-install_symlink {
- name: "rfs_msm_wpss_ramdumps_symlink",
- vendor: true,
- installed_location: "rfs/msm/wpss/ramdumps",
- symlink_target: "/data/vendor/tombstones/rfs/wpss",
-}
-
-install_symlink {
- name: "rfs_msm_wpss_readonly_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/wpss/readonly/firmware",
- symlink_target: "/vendor/firmware_mnt",
-}
-
-install_symlink {
- name: "rfs_msm_wpss_readonly_vendor_firmware_symlink",
- vendor: true,
- installed_location: "rfs/msm/wpss/readonly/vendor/firmware",
- symlink_target: "/vendor/firmware",
-}
-
-install_symlink {
- name: "rfs_msm_wpss_readwrite_symlink",
- vendor: true,
- installed_location: "rfs/msm/wpss/readwrite",
- symlink_target: "/mnt/vendor/persist/rfs/msm/wpss",
-}
-
-install_symlink {
- name: "rfs_msm_wpss_shared_symlink",
- vendor: true,
- installed_location: "rfs/msm/wpss/shared",
- symlink_target: "/mnt/vendor/persist/rfs/shared",
-}
diff --git a/qcom/common.mk b/qcom/common.mk
deleted file mode 100644
index 9415178..0000000
--- a/qcom/common.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-# RFS APQ GNSS symlinks
-PRODUCT_PACKAGES += \
- rfs_apq_gnss_hlos_symlink \
- rfs_apq_gnss_ramdumps_symlink \
- rfs_apq_gnss_readonly_firmware_symlink \
- rfs_apq_gnss_readonly_vendor_firmware_symlink \
- rfs_apq_gnss_readwrite_symlink \
- rfs_apq_gnss_shared_symlink
-
-# RFS MDM ADSP symlinks
-PRODUCT_PACKAGES += \
- rfs_mdm_adsp_hlos_symlink \
- rfs_mdm_adsp_ramdumps_symlink \
- rfs_mdm_adsp_readonly_firmware_symlink \
- rfs_mdm_adsp_readonly_vendor_firmware_symlink \
- rfs_mdm_adsp_readwrite_symlink \
- rfs_mdm_adsp_shared_symlink
-
-# RFS MDM CDSP symlinks
-PRODUCT_PACKAGES += \
- rfs_mdm_cdsp_hlos_symlink \
- rfs_mdm_cdsp_ramdumps_symlink \
- rfs_mdm_cdsp_readonly_firmware_symlink \
- rfs_mdm_cdsp_readonly_vendor_firmware_symlink \
- rfs_mdm_cdsp_readwrite_symlink \
- rfs_mdm_cdsp_shared_symlink
-
-# RFS MDM MPSS symlinks
-PRODUCT_PACKAGES += \
- rfs_mdm_mpss_hlos_symlink \
- rfs_mdm_mpss_ramdumps_symlink \
- rfs_mdm_mpss_readonly_firmware_symlink \
- rfs_mdm_mpss_readonly_vendor_firmware_symlink \
- rfs_mdm_mpss_readwrite_symlink \
- rfs_mdm_mpss_shared_symlink
-
-# RFS MDM SLPI symlinks
-PRODUCT_PACKAGES += \
- rfs_mdm_slpi_hlos_symlink \
- rfs_mdm_slpi_ramdumps_symlink \
- rfs_mdm_slpi_readonly_firmware_symlink \
- rfs_mdm_slpi_readonly_vendor_firmware_symlink \
- rfs_mdm_slpi_readwrite_symlink \
- rfs_mdm_slpi_shared_symlink
-
-# RFS MDM TN symlinks
-PRODUCT_PACKAGES += \
- rfs_mdm_tn_hlos_symlink \
- rfs_mdm_tn_ramdumps_symlink \
- rfs_mdm_tn_readonly_firmware_symlink \
- rfs_mdm_tn_readonly_vendor_firmware_symlink \
- rfs_mdm_tn_readwrite_symlink \
- rfs_mdm_tn_shared_symlink
-
-# RFS MDM WPSS symlinks
-PRODUCT_PACKAGES += \
- rfs_mdm_wpss_hlos_symlink \
- rfs_mdm_wpss_ramdumps_symlink \
- rfs_mdm_wpss_readonly_firmware_symlink \
- rfs_mdm_wpss_readonly_vendor_firmware_symlink \
- rfs_mdm_wpss_readwrite_symlink \
- rfs_mdm_wpss_shared_symlink
-
-# RFS MSM ADSP symlinks
-PRODUCT_PACKAGES += \
- rfs_msm_adsp_hlos_symlink \
- rfs_msm_adsp_ramdumps_symlink \
- rfs_msm_adsp_readonly_firmware_symlink \
- rfs_msm_adsp_readonly_vendor_firmware_symlink \
- rfs_msm_adsp_readwrite_symlink \
- rfs_msm_adsp_shared_symlink
-
-# RFS MSM CDSP symlinks
-PRODUCT_PACKAGES += \
- rfs_msm_cdsp_hlos_symlink \
- rfs_msm_cdsp_ramdumps_symlink \
- rfs_msm_cdsp_readonly_firmware_symlink \
- rfs_msm_cdsp_readonly_vendor_firmware_symlink \
- rfs_msm_cdsp_readwrite_symlink \
- rfs_msm_cdsp_shared_symlink
-
-# RFS MSM MPSS symlinks
-PRODUCT_PACKAGES += \
- rfs_msm_mpss_hlos_symlink \
- rfs_msm_mpss_ramdumps_symlink \
- rfs_msm_mpss_readonly_firmware_symlink \
- rfs_msm_mpss_readonly_vendor_firmware_symlink \
- rfs_msm_mpss_readwrite_symlink \
- rfs_msm_mpss_shared_symlink
-
-# RFS MSM SLPI symlinks
-PRODUCT_PACKAGES += \
- rfs_msm_slpi_hlos_symlink \
- rfs_msm_slpi_ramdumps_symlink \
- rfs_msm_slpi_readonly_firmware_symlink \
- rfs_msm_slpi_readonly_vendor_firmware_symlink \
- rfs_msm_slpi_readwrite_symlink \
- rfs_msm_slpi_shared_symlink
-
-# RFS MSM WPSS symlinks
-PRODUCT_PACKAGES += \
- rfs_msm_wpss_hlos_symlink \
- rfs_msm_wpss_ramdumps_symlink \
- rfs_msm_wpss_readonly_firmware_symlink \
- rfs_msm_wpss_readonly_vendor_firmware_symlink \
- rfs_msm_wpss_readwrite_symlink \
- rfs_msm_wpss_shared_symlink