Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8960c998 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: add audio kernel header dependency only for msmnile"

parents bd4ce465 b8af9a6d

hal/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ LOCAL_SRC_FILES += audio_extn/audio_extn.c \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

  LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)

endif

mm-audio/aenc-aac/qdsp6/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ LOCAL_SRC_FILES += src/omx_aac_aenc.cpp 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

  LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)

endif

mm-audio/aenc-amrnb/qdsp6/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ LOCAL_SRC_FILES += src/omx_amr_aenc.cpp 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

  LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)

endif

mm-audio/aenc-evrc/qdsp6/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ LOCAL_SRC_FILES += src/omx_evrc_aenc.cpp 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

  LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)

endif

mm-audio/aenc-g711/qdsp6/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -43,8 +43,10 @@ LOCAL_SRC_FILES += src/omx_log.cpp 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

  LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)

endif