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

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

Merge "hal: Use DLKM feature flag to define include rule"

parents 3c1342fd 210465d6

hal/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ endif 


ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)

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

        LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

        LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXT_HDMI)),true)

post_proc/Android.mk

+4 −8
Original line number Diff line number Diff line
@@ -65,17 +65,15 @@ LOCAL_C_INCLUDES := \ 
	$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \

        $(call include-path-for, audio-effects)



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

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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



ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)

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

        LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

        LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

endif



include $(BUILD_SHARED_LIBRARY)
@@ -165,17 +163,15 @@ LOCAL_C_INCLUDES := \ 
        hardware/qcom/audio/hal/audio_extn \

        external/tinycompress/include



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

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

endif

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



ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)

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

        LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

        LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

endif



include $(BUILD_SHARED_LIBRARY)