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

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

Merge "audio: Access header files through header libs"

parents 689a4b5f e8bd13c7

hal/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ endif 


LOCAL_CFLAGS += -Wno-macro-redefined



LOCAL_HEADER_LIBRARIES := libhardware_headers



LOCAL_SRC_FILES := \

	audio_hw.c \

	voice.c \
@@ -74,7 +76,7 @@ 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 msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

  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

post_proc/Android.mk

+14 −2
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ ifneq ($(strip $(AUDIO_FEATURE_DISABLED_DTS_EAGLE)),true) 
    LOCAL_CFLAGS += -DDTS_EAGLE

endif



LOCAL_HEADER_LIBRARIES := libhardware_headers \

                          libsystem_headers \

                          libutils_headers



LOCAL_SHARED_LIBRARIES := \

        libcutils \

        liblog \
@@ -66,7 +70,7 @@ LOCAL_C_INCLUDES := \ 
        $(call include-path-for, audio-effects)



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

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

  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
@@ -100,6 +104,10 @@ LOCAL_SRC_FILES := EffectsHwAcc.cpp 
LOCAL_C_INCLUDES := \

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



LOCAL_HEADER_LIBRARIES := libhardware_headers \

                          libsystem_headers \

                          libutils_headers



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libeffects
@@ -148,6 +156,10 @@ LOCAL_SRC_FILES:= \ 


LOCAL_CFLAGS+= -O2 -fvisibility=hidden



LOCAL_HEADER_LIBRARIES := libhardware_headers \

                          libsystem_headers \

                          libutils_headers



LOCAL_SHARED_LIBRARIES := \

        libcutils \

        liblog \
@@ -170,7 +182,7 @@ LOCAL_C_INCLUDES := \ 
        external/tinycompress/include



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

  LOCAL_HEADER_LIBRARIES := audio_kernel_headers

  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

visualizer/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ ifneq ($(filter sdm660 sdm845 msm8998 apq8098_latv sdm670 qcs605 msmnile,$(TARGE 
    LOCAL_CFLAGS += -DCAPTURE_DEVICE=7

endif



LOCAL_HEADER_LIBRARIES := libsystem_headers \

                          libhardware_headers

LOCAL_SHARED_LIBRARIES := \

	libcutils \

	liblog \

voice_processing/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_SHARED_LIBRARIES += libdl



LOCAL_HEADER_LIBRARIES := libhardware_headers

LOCAL_CFLAGS += -fvisibility=hidden



LOCAL_CFLAGS += -Wno-unused-variable