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

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

Merge "hal: Enable compilation of 8937 on 4.0 component" into audio-hal.lnx.4.0

parents d9076754 16d5b606

hal/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 
ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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

ifneq ($(filter sdm670 msm8953 msm8937 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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 
ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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

ifneq ($(filter sdm670 msm8953 msm8937 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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 
ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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

ifneq ($(filter sdm670 msm8953 msm8937 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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 
ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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

ifneq ($(filter sdm670 msm8953 msm8937 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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 
ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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

ifneq ($(filter sdm670 msm8953 msm8937 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