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

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

Merge "audio-hal: Fix audio makefile violations"

parents 054813a1 6049667d

configs/msm8937/msm8937.mk

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ endif 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

   ifeq ($(TARGET_PRODUCT),sdm429w_law)

   ifeq ($(TARGET_BOARD_PLATFORM),sdm429w_law)

      PRODUCT_COPY_FILES += \

      $(TOPDIR)$(PRIMARYHAL_PATH)/configs/msm8937/audio_policy_configuration_sdm429w_law.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml

   else ifeq ($(TARGET_SUPPORTS_WEARABLES), true)
@@ -235,7 +235,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
audio.offload.min.duration.secs=30



#Enable offload audio video playback by default

ifneq ($(TARGET_PRODUCT),sdm429w)

ifneq ($(TARGET_BOARD_PLATFORM),sdm429w)

PRODUCT_PROPERTY_OVERRIDES += \

audio.offload.video=true

endif

configs/msmnile_au/msmnile_au.mk

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ endif 
ifneq ($(ENABLE_HYP),true)

AUDIO_FEATURE_ENABLED_AUTO_AUDIOD := true



ifneq ( ,$(filter msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar msmnile_tb, $(TARGET_PRODUCT)))

ifneq ( ,$(filter msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar msmnile_tb, $(TARGET_BOARD_PLATFORM)))

AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := true

else

AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := false
@@ -144,7 +144,7 @@ endif 
ifneq ( ,$(filter msmnile_gvmq msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar msmnile_gvmq_vcu msmnile_gvmq_s_u, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX)))

AUDIO_FEATURE_ENABLED_AUDIO_PARSERS := true

endif

ifneq ( ,$(filter msmnile_tb, $(TARGET_PRODUCT)))

ifneq ( ,$(filter msmnile_tb, $(TARGET_BOARD_PLATFORM)))

AUDIO_FEATURE_ENABLED_AUDIO_PARSERS := true

endif

##AUTOMOTIVE_AUDIO_FEATURE_FLAGS

hal/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -425,9 +425,6 @@ endif 
LOCAL_CFLAGS += -D_GNU_SOURCE

LOCAL_CFLAGS += -Wall -Werror



LOCAL_COPY_HEADERS_TO   := mm-audio

LOCAL_COPY_HEADERS      := audio_extn/audio_defs.h



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_GCOV)),true)

    LOCAL_CFLAGS += --coverage -fprofile-arcs -ftest-coverage

    LOCAL_CPPFLAGS += --coverage -fprofile-arcs -ftest-coverage

hal/audio_extn/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -209,9 +209,10 @@ LOCAL_C_INCLUDES := \ 
    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \

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

    $(TARGET_OUT_HEADERS)/mm-audio/surround_sound_3mic/ \

    $(TARGET_OUT_HEADERS)/common/inc/



LOCAL_HEADER_LIBRARIES += libsurround_3mic_proc_headers



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi

endif

qahw/Android.mk

+8 −4
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ LOCAL_HEADER_LIBRARIES := libutils_headers \ 
    libsystem_headers \

    libhardware_headers



LOCAL_HEADER_LIBRARIES += libqahw_headers



LOCAL_SRC_FILES := \

    src/qahw.c \

    src/qahw_effect.c
@@ -27,10 +29,6 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_CFLAGS += -Wall -Werror



LOCAL_COPY_HEADERS_TO   := mm-audio/qahw/inc

LOCAL_COPY_HEADERS      := inc/qahw.h

LOCAL_COPY_HEADERS      += inc/qahw_effect_api.h



LOCAL_PROPRIETARY_MODULE := true

LOCAL_VENDOR_MODULE     := true
@@ -39,5 +37,11 @@ LOCAL_SANITIZE := integer_overflow 
endif

include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE := libqahwwrapper_headers

LOCAL_EXPORT_C_INCLUDE_DIRS   := $(LOCAL_PATH)/inc/

LOCAL_VENDOR_MODULE := true

include $(BUILD_HEADER_LIBRARY)



endif

endif