Merge e8ce99f138e3927031cd5a07212ee4773b5bbfef on remote branch (d735ef7c) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		ifneq ($(DUAL_AUDIO_FRAMEWORK_AR), true)
		ifneq ($(AUDIO_USE_STUB_HAL), true)
		ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile kona lahaina holi $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile gen4 kona lahaina holi $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)

		MY_LOCAL_PATH := $(call my-dir)

configs/audio_vendor_product.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,11 @@ MM_AUDIO += Headset_cal.acdb
		MM_AUDIO += Speaker_cal.acdb

		MM_AUDIO += libaudiohalplugin
		ifeq ($(call is-board-platform-in-list,gen4),true)
		MM_AUDIO += libaudio_dac
		MM_AUDIO += libaudio_expander
		MM_AUDIO += exp_dac_test
		endif #gen4
		MM_AUDIO += libcdcdriver
		MM_AUDIO += libvad
		MM_AUDIO += capi_v2_bmt
		@@ -227,3 +232,9 @@ else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATI
		else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX),sm6150_au)
		-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/msmsteppe_au.mk
		endif

		ifeq ($(TARGET_BOARD_AUTO),true)
		ifeq ($(TARGET_USES_RRO),true)
		PRODUCT_PACKAGES += CarServiceResAutoTarget_Vendor
		endif
		endif

configs/msmnile_au/msmnile_au.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ endif
		ifneq ($(ENABLE_HYP),true)
		AUDIO_FEATURE_ENABLED_AUTO_AUDIOD := true

		ifneq ( ,$(filter msmnile_au msmnile_au_km4 msmnile_au_ar msmnile_tb, $(TARGET_PRODUCT)))
		ifneq ( ,$(filter msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar msmnile_tb, $(TARGET_PRODUCT)))
		AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := true
		else
		AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := false
		@@ -140,7 +140,7 @@ AUDIO_FEATURE_ENABLED_ICC := true
		ifneq ( ,$(filter T Tiramisu 13 U UpsideDownCake 14, $(PLATFORM_VERSION)))
		AUDIO_FEATURE_ENABLED_POWER_POLICY := true
		endif
		ifneq ( ,$(filter msmnile_gvmq msmnile_au msmnile_au_km4 msmnile_au_ar, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX)))
		ifneq ( ,$(filter msmnile_gvmq msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX)))
		AUDIO_FEATURE_ENABLED_AUDIO_PARSERS := true
		endif
		##AUTOMOTIVE_AUDIO_FEATURE_FLAGS
		@@ -151,7 +151,7 @@ DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/
		endif

		ifneq ( ,$(filter T Tiramisu 13 U UpsideDownCake 14, $(PLATFORM_VERSION)))
		ifneq ( ,$(filter msmnile_au msmnile_au_km4 msmnile_au_ar, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX))$(TARGET_BOARD_DERIVATIVE_SUFFIX))
		ifneq ( ,$(filter msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX))$(TARGET_BOARD_DERIVATIVE_SUFFIX))
		AUDIO_FEATURE_MMAP_AAUDIO = true
		endif
		endif

configs/msmsteppe_au/msmsteppe_au.mk

+6 −4

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true
		AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false
		AUDIO_FEATURE_ENABLED_DEV_ARBI := false
		AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true
		MM_AUDIO_ENABLED_FTM := true
		MM_AUDIO_ENABLED_FTM := false
		TARGET_USES_QCOM_MM_AUDIO := true
		AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true
		AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
		@@ -83,7 +83,9 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
		AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false
		##AUDIO_FEATURE_FLAGS

		ifneq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
		AUDIO_HARDWARE += audio.a2dp.default
		endif
		AUDIO_HARDWARE += audio.usb.default
		AUDIO_HARDWARE += audio.r_submix.default
		AUDIO_HARDWARE += audio.primary.$(MSMSTEPPE)
		@@ -103,7 +105,7 @@ PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)
		AUDIO_FEATURE_ENABLED_AUTO_HAL := true
		AUDIO_FEATURE_ENABLED_EXT_HW_PLUGIN := true
		AUDIO_FEATURE_ENABLED_AUDIO_CONTROL_HAL := true
		ifneq ( ,$(filter T Tiramisu 13, $(PLATFORM_VERSION)))
		ifneq ( ,$(filter T Tiramisu 13 U UpsideDownCake 14, $(PLATFORM_VERSION)))
		AUDIO_FEATURE_ENABLED_AUDIO_CONTROL_HAL_AIDL := true
		endif
		ifneq ($(ENABLE_HYP),true)
		@@ -113,7 +115,7 @@ AUDIO_FEATURE_ENABLED_SILENT_BOOT := true
		endif
		AUDIO_FEATURE_ENABLED_FM_TUNER_EXT := true
		AUDIO_FEATURE_ENABLED_ICC := true
		ifneq ( ,$(filter S 12, $(PLATFORM_VERSION)))
		ifneq ( ,$(filter S 12 U UpsideDownCake 14, $(PLATFORM_VERSION)))
		AUDIO_FEATURE_ENABLED_POWER_POLICY := true
		endif
		ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX), sm6150_au)
		@@ -506,7 +508,7 @@ PRODUCT_PACKAGES_DEBUG += \
		AudioSettings

		# for HIDL related audiocontrol packages
		ifeq ( ,$(filter 12 13,$(PLATFORM_VERSION)))
		ifeq ( ,$(filter 12 13 U UpsideDownCake 14, $(PLATFORM_VERSION)))
		PRODUCT_PACKAGES += \
		android.hardware.automotive.audiocontrol@2.0-service \
		android.hardware.automotive.audiocontrol@2.0

hal/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ LIBRARY_TINYCOMPRESS := libqti-tinycompress
		LIBRARY_TINYCOMPRESS_INC := $(TOP)/vendor/qcom/opensource/tinycompress/include
		endif

		ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 sdmshrike msmnile kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET) lito atoll bengal,$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 sdmshrike msmnile gen4 kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET) lito atoll bengal,$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM = msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true
		@@ -72,7 +72,7 @@ endif
		ifneq ($(filter qcs605,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_QCS605
		endif
		ifneq ($(filter msmnile sdmshrike,$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter msmnile gen4 sdmshrike,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSMNILE
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
		LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED