StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "config: Changes for libfmjni bp conversion"

Browse Source 
This reverts commit d6777fa812.
Reason for revert: The soong namespaces can be removed after reworking
libfmjni to use select() with filegroups and header libs for qcom/slsi.
Broadcom is not used in any recent shipping device and mtk can continue
using prebuilt for now.

Change-Id: I078b321c7c55c3d7e5cd97e2664208c3d44f513a
This commit is contained in:
borbelyvince
2025-02-07 18:47:02 +01:00
committed by Michael Bestas
parent 03f912f8cd
commit 81d6c3cc92
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/soong/Android.bp
View File

@@ -453,20 +453,3 @@ qti_vibrator_hal {
}, },
}, },
} }
soong_config_module_type {
name: "qcom_libfmjni",
module_type: "cc_defaults",
config_namespace: "lineageQcomVars",
bool_variables: ["no_fm_firmware"],
properties: ["cflags"],
}
qcom_libfmjni {
name: "qcom_libfmjni_defaults",
soong_config_variables: {
no_fm_firmware: {
cflags: ["-DQCOM_NO_FM_FIRMWARE"],
},
},
}

17
config/BoardConfigSoong.mk
View File

@@ -62,7 +62,6 @@ SOONG_CONFIG_lineageNvidiaVars += \
SOONG_CONFIG_NAMESPACES += lineageQcomVars SOONG_CONFIG_NAMESPACES += lineageQcomVars
SOONG_CONFIG_lineageQcomVars += \ SOONG_CONFIG_lineageQcomVars += \
no_fm_firmware \
qti_vibrator_effect_lib \ qti_vibrator_effect_lib \
qti_vibrator_use_effect_stream \ qti_vibrator_use_effect_stream \
supports_extended_compress_format \ supports_extended_compress_format \
@@ -81,7 +80,6 @@ SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRAL
SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_ubwcp_format := $(TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT) SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_ubwcp_format := $(TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT)
SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPLAY_ARRAY) SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPLAY_ARRAY)
SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS) SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
SOONG_CONFIG_lineageQcomVars_no_fm_firmware := $(TARGET_QCOM_NO_FM_FIRMWARE)
SOONG_CONFIG_lineageQcomVars_qti_vibrator_use_effect_stream := $(TARGET_QTI_VIBRATOR_USE_EFFECT_STREAM) SOONG_CONFIG_lineageQcomVars_qti_vibrator_use_effect_stream := $(TARGET_QTI_VIBRATOR_USE_EFFECT_STREAM)
SOONG_CONFIG_lineageQcomVars_supports_extended_compress_format := $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT) SOONG_CONFIG_lineageQcomVars_supports_extended_compress_format := $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)
SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_PRE_UPLINK_FEATURES_NETMGRD) SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_PRE_UPLINK_FEATURES_NETMGRD)
@@ -135,18 +133,3 @@ else
SOONG_CONFIG_lineageQcomVars_qcom_display_headers_namespace := $(QCOM_SOONG_NAMESPACE)/display SOONG_CONFIG_lineageQcomVars_qcom_display_headers_namespace := $(QCOM_SOONG_NAMESPACE)/display
endif endif
SOONG_CONFIG_lineageQcomVars_qti_vibrator_effect_lib := $(TARGET_QTI_VIBRATOR_EFFECT_LIB) SOONG_CONFIG_lineageQcomVars_qti_vibrator_effect_lib := $(TARGET_QTI_VIBRATOR_EFFECT_LIB)
# libfmjni
ifeq ($(BOARD_HAVE_QCOM_FM),true)
PRODUCT_SOONG_NAMESPACES += \
vendor/qcom/opensource/libfmjni
else ifeq ($(BOARD_HAVE_BCM_FM),true)
PRODUCT_SOONG_NAMESPACES += \
hardware/broadcom/fm
else ifeq ($(BOARD_HAVE_SLSI_FM),true)
PRODUCT_SOONG_NAMESPACES += \
hardware/samsung_slsi/fm
else ifneq ($(BOARD_HAVE_MTK_FM),true)
PRODUCT_SOONG_NAMESPACES += \
packages/apps/FMRadio/jni/fmr
endif