diff --git a/configs/msm8937/msm8937.mk b/configs/msm8937/msm8937.mk index 5db99695..adebb105 100644 --- a/configs/msm8937/msm8937.mk +++ b/configs/msm8937/msm8937.mk @@ -71,9 +71,18 @@ AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true endif ##AUDIO_FEATURE_FLAGS -#Audio Specific device overlays -DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay +ifneq ($(BOARD_OPENSOURCE_DIR), ) + #Audio Specific device overlays + DEVICE_PACKAGE_OVERLAYS += $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/configs/common/overlay + #AudioHal-primaryHal path + PRIMARYHAL_PATH += $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal +else + #Audio Specific device overlays + DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay + #AudioHal-primaryHal path + PRIMARYHAL_PATH += vendor/qcom/opensource/audio-hal/primary-hal +endif # BOARD_OPENSOURCE_DIR ifeq ($(TARGET_SUPPORTS_WEARABLES),true) ifeq ($(TARGET_KERNEL_VERSION), 4.14) @@ -88,7 +97,7 @@ ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true) ifeq ($(TARGET_SUPPORTS_WEARABLES), true) ifeq ($(AUDIO_FEATURE_ENABLED_SPLIT_A2DP), true) PRODUCT_COPY_FILES += \ - vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf + $(PRIMARYHAL_PATH)/configs/msm8937/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf else PRODUCT_COPY_FILES += \ $(BOARD_COMMON_DIR)/media/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf @@ -99,7 +108,7 @@ ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true) endif else PRODUCT_COPY_FILES += \ - vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf + $(PRIMARYHAL_PATH)/configs/msm8937/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf endif # Target supports smartPA @@ -108,63 +117,63 @@ WEARABLE_SUPPORTS_TFA_SMARTPA := true endif PRODUCT_COPY_FILES +=\ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf\ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf\ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tashalite.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_sku1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_sku1.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wtp.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wtp_newport.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/sound_trigger_mixer_paths_wcd9306.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9306.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/sound_trigger_mixer_paths_wcd9335.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9335.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tashalite.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tasha.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_mtp.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_wtp.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_wtp_newport.xml \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ -vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml +$(PRIMARYHAL_PATH)/configs/msm8937/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf\ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf\ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tashalite.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_sku1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_sku1.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wtp.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wtp_newport.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/sound_trigger_mixer_paths_wcd9306.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9306.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/sound_trigger_mixer_paths_wcd9335.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9335.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tashalite.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tasha.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_mtp.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_wtp.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_wtp_newport.xml \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ +$(PRIMARYHAL_PATH)/configs/msm8937/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml ifeq ($(TARGET_SUPPORTS_WEARABLES), true) ifeq ($(TARGET_SUPPORTS_A2DP_SLIMBUS_INTERFACE),true) PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_sdm429w_dvt2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml else PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml endif else PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml endif #XML Audio configuration files ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) ifeq ($(TARGET_PRODUCT),sdm429w_law) PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration_sdm429w_law.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_policy_configuration_sdm429w_law.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml else ifeq ($(TARGET_SUPPORTS_WEARABLES), true) PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_policy_configuration_sdm429w.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml else ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true) PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration_common.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_policy_configuration_common.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml else PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \ + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration_common.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml endif PRODUCT_COPY_FILES += \ - $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + $(TOPDIR)$(PRIMARYHAL_PATH)/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ diff --git a/hal/Android.mk b/hal/Android.mk index e57b859b..4651e19c 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -176,12 +176,16 @@ LOCAL_C_INCLUDES += \ external/tinycompress/include \ system/media/audio_utils/include \ external/expat/lib \ - vendor/qcom/opensource/core-utils/fwk-detect \ $(call include-path-for, audio-route) \ $(call include-path-for, audio-effects) \ $(LOCAL_PATH)/$(AUDIO_PLATFORM) \ $(LOCAL_PATH)/audio_extn \ $(LOCAL_PATH)/voice_extn +ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/core-utils/fwk-detect +else + LOCAL_C_INCLUDES += vendor/qcom/opensource/core-utils/fwk-detect +endif # BOARD_OPENSOURCE_DIR LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio @@ -192,7 +196,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr # Hardware specific feature ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include +ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)),true) diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk old mode 100755 new mode 100644 index bc8392d8..54047c92 --- a/hal/audio_extn/Android.mk +++ b/hal/audio_extn/Android.mk @@ -1,3 +1,12 @@ +#AudioHal-primaryHal-Hal path +ifneq ($(BOARD_OPENSOURCE_DIR), ) + PRIMARY_HAL_PATH := $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal + AUDIO_KERNEL_INC := $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include +else + PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal + AUDIO_KERNEL_INC := $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include +endif # BOARD_OPENSOURCE_DIR + #-------------------------------------------- # Build SND_MONITOR LIB #-------------------------------------------- @@ -36,7 +45,7 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ + $(PRIMARY_HAL_PATH) \ $(call include-path-for, audio-effects) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -46,7 +55,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -104,8 +113,8 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ + $(PRIMARY_HAL_PATH) \ + $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ $(call include-path-for, audio-effects) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -115,7 +124,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -169,8 +178,8 @@ LOCAL_SHARED_LIBRARIES := \ libprocessgroup LOCAL_C_INCLUDES := \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ + $(PRIMARY_HAL_PATH) \ + $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ external/tinyalsa/include \ external/tinycompress/include \ external/expat/lib \ @@ -187,7 +196,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(PRIMARY_HAL_PATH) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -212,7 +221,6 @@ LOCAL_MODULE := libhdmiedid LOCAL_MODULE_OWNER := third_party LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -256,7 +264,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -313,11 +321,15 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ - vendor/qcom/opensource/audio-kernel/include/uapi/ \ + $(PRIMARY_HAL_PATH) \ + $(PRIMARY_HAL_PATH)/audio_extn \ + $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ $(call include-path-for, audio-effects) +ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/audio-kernel/include/uapi/ +else + LOCAL_C_INCLUDES += vendor/qcom/opensource/audio-kernel/include/uapi/ +endif # BOARD_OPENSOURCE_DIR LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio @@ -378,11 +390,16 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ - vendor/qcom/opensource/audio-kernel/include/uapi/ \ + $(PRIMARY_HAL_PATH) \ + $(PRIMARY_HAL_PATH)/audio_extn \ + $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ $(call include-path-for, audio-effects) +ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/audio-kernel/include/uapi/ +else + LOCAL_C_INCLUDES += vendor/qcom/opensource/audio-kernel/include/uapi/ +endif # BOARD_OPENSOURCE_DIR + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio @@ -404,7 +421,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := liba2dpoffload LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -449,7 +465,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -475,7 +491,6 @@ LOCAL_MODULE := libexthwplugin LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -523,7 +538,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -541,7 +556,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhfp LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -590,7 +604,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -614,7 +628,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libicc LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -663,7 +676,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -681,7 +694,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libsynth LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -730,7 +742,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -748,7 +760,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhdmipassthru LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -796,7 +807,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) @@ -825,7 +836,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libbatterylistener LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -879,7 +889,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -897,7 +907,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhwdepcal LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -941,7 +950,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -959,7 +968,6 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libmaxxaudio LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -1004,7 +1012,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -1021,7 +1029,6 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libaudiozoom LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -1066,7 +1073,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -1087,7 +1094,6 @@ LOCAL_MODULE := libautohal LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito atoll bengal sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -1129,7 +1135,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + LOCAL_C_INCLUDES += $(AUDIO_KERNEL_INC) endif LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -1156,7 +1162,7 @@ LOCAL_SRC_FILES:= \ power_policy_launcher.cpp LOCAL_C_INCLUDES:= \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ + $(PRIMARY_HAL_PATH) \ system/media/audio/include LOCAL_SHARED_LIBRARIES:= \ diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk index 45ddf22e..d8bcf05a 100644 --- a/mm-audio/aenc-aac/qdsp6/Android.mk +++ b/mm-audio/aenc-aac/qdsp6/Android.mk @@ -50,7 +50,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_HEADER_LIBRARIES := libomxcore_headers ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),) diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk index 7ccc7db5..648d9324 100644 --- a/mm-audio/aenc-amrnb/qdsp6/Android.mk +++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk @@ -51,7 +51,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_HEADER_LIBRARIES := libomxcore_headers ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),) diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk index 39714700..5022ea15 100644 --- a/mm-audio/aenc-evrc/qdsp6/Android.mk +++ b/mm-audio/aenc-evrc/qdsp6/Android.mk @@ -51,7 +51,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_HEADER_LIBRARIES := libomxcore_headers ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),) diff --git a/mm-audio/aenc-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk index a1a59e35..7b232216 100644 --- a/mm-audio/aenc-g711/qdsp6/Android.mk +++ b/mm-audio/aenc-g711/qdsp6/Android.mk @@ -52,7 +52,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_HEADER_LIBRARIES := libomxcore_headers ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk index f071d23b..8b7ee03f 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk +++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk @@ -51,7 +51,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_HEADER_LIBRARIES := libomxcore_headers ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif diff --git a/post_proc/Android.mk b/post_proc/Android.mk index 774198d8..94e88730 100644 --- a/post_proc/Android.mk +++ b/post_proc/Android.mk @@ -82,16 +82,25 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_C_INCLUDES := \ external/tinyalsa/include \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio \ - $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \ - $(call include-path-for, audio-effects) \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn/ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \ + $(call include-path-for, audio-effects) +ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal \ + $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal/audio_extn/ +else + LOCAL_C_INCLUDES += vendor/qcom/opensource/audio-hal/primary-hal/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn/ +endif # BOARD_OPENSOURCE_DIR ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) @@ -195,20 +204,29 @@ LOCAL_MODULE_OWNER := qti LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_C_INCLUDES := \ - vendor/qcom/opensource/audio-hal/primary-hal/hal \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \ external/tinyalsa/include \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-route) \ - vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn \ external/tinycompress/include \ system/media/audio_utils/include +ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal \ + $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal/audio_extn +else + LOCAL_C_INCLUDES += vendor/qcom/opensource/audio-hal/primary-hal/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn +endif # BOARD_OPENSOURCE_DIR ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers - LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + ifneq ($(BOARD_OPENSOURCE_DIR), ) + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include + else + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include + endif # BOARD_OPENSOURCE_DIR endif ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)