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

Commit 41e35ebf authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge " K5.15 Audio Techpack, fix for compilation issues."

parents da1da255 de8f7396

hal/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,10 @@ LOCAL_CFLAGS += -Wno-macro-redefined 


LOCAL_HEADER_LIBRARIES := libhardware_headers



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_SRC_FILES := \

    audio_hw.c \

    acdb.c \

hal/audio_extn/Android.mk

+65 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -260,6 +265,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -334,6 +344,11 @@ 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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
@@ -404,6 +419,11 @@ 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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -461,6 +481,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -534,6 +559,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -600,6 +630,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -672,6 +707,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -738,6 +778,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -803,6 +848,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -1008,6 +1058,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -1069,6 +1124,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -1131,6 +1191,11 @@ LOCAL_C_INCLUDES := \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

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

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



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



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

hal/audio_extn/compress_in.c

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ 
/* default timestamp metadata definition if not defined in kernel*/

#ifndef COMPRESSED_TIMESTAMP_FLAG

#define COMPRESSED_TIMESTAMP_FLAG 0

struct snd_codec_metadata {

uint64_t timestamp;

};

#define compress_config_set_timstamp_flag(config) (-ENOSYS)

#else

#ifdef AUDIO_GKI_ENABLED

post_proc/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) 
        LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

endif



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif



ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif