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

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

Merge "audio-hal: enabling audio daemon based for TARGET_PRODUCT"

parents 663ec21f de060a48

configs/msmnile_au/msmnile_au.mk

+7 −0
Original line number Diff line number Diff line
@@ -90,6 +90,13 @@ AUDIO_FEATURE_ENABLED_EXT_HW_PLUGIN := true 
AUDIO_FEATURE_ENABLED_AUDIO_CONTROL_HAL := true

ifneq ($(ENABLE_HYP),true)

AUDIO_FEATURE_ENABLED_AUTO_AUDIOD := true



ifeq ($(TARGET_PRODUCT),msmnile_au)

AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := true

else

AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := false

endif



endif

AUDIO_FEATURE_ENABLED_FM_TUNER_EXT := true

AUDIO_FEATURE_ENABLED_ICC := true

configs/msmsteppe_au/msmsteppe_au.mk

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ AUDIO_FEATURE_ENABLED_EXT_HW_PLUGIN := true 
AUDIO_FEATURE_ENABLED_AUDIO_CONTROL_HAL := true

ifneq ($(ENABLE_HYP),true)

AUDIO_FEATURE_ENABLED_AUTO_AUDIOD := true

AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := true

endif

AUDIO_FEATURE_ENABLED_FM_TUNER_EXT := true

AUDIO_FEATURE_ENABLED_ICC := true

hal/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ ifeq ($(TARGET_BOARD_AUTO),true) 
  LOCAL_CFLAGS += -DPLATFORM_AUTO

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT)), true)

  LOCAL_CFLAGS += -DDAEMON_SUPPORT_AUTO

endif



LOCAL_CFLAGS += -Wno-macro-redefined



LOCAL_HEADER_LIBRARIES := libhardware_headers

hal/acdb.h

+6 −0
Original line number Diff line number Diff line
@@ -24,7 +24,13 @@ 
#include <linux/msm_audio_calibration.h>



#define MAX_CVD_VERSION_STRING_SIZE 100



#ifdef DAEMON_SUPPORT_AUTO

#define LIB_ACDB_LOADER "libacdbloaderclient.so"

#else

#define LIB_ACDB_LOADER "libacdbloader.so"

#endif



#define CVD_VERSION_MIXER_CTL "CVD Version"

#define ACDB_METAINFO_KEY_MODULE_NAME_LEN 100

hal/audio_extn/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -493,6 +493,10 @@ LOCAL_CFLAGS += \ 
    -Wno-unused-function \

    -Wno-unused-variable



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT)), true)

  LOCAL_CFLAGS += -DDAEMON_SUPPORT_AUTO

endif



LOCAL_SHARED_LIBRARIES := \

    libaudioroute \

    libaudioutils \