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

Commit 61718507 authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
Browse files

hal: Invert standard build flags 

 * Always include these unless explicitly negated

Change-Id: I3931ef089dddcd9ac9f61d8b7e870cf916a4e47d

hal: Disable deprecated features

 * Disable deprecated in-call music feature
 * Don't automatically enable AUDIO_FEATURE_ENABLED_EXTN_FORMATS

Change-Id: Ib73b0ebadb102dada2c266f60f60238bb17679d7

policy_hal: Invert standard build flags

* Enable compress proxy in policy_hal since it's
  already enabled in hal & post_proc by default

Change-Id: I96de446990af415d909fb074c15e69f78f8df5b6
parent fe3fb1c0

hal/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -77,11 +77,11 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_VBAT_MONITOR)),true) 
    LOCAL_CFLAGS += -DVBAT_MONITOR_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLUENCE)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_FLUENCE)),false)

    LOCAL_CFLAGS += -DFLUENCE_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),false)

    LOCAL_CFLAGS += -DAFE_PROXY_ENABLED

endif
@@ -99,7 +99,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USBAUDIO)),true) 
    LOCAL_SRC_FILES += audio_extn/usb.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HFP)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_HFP)),false)

    LOCAL_CFLAGS += -DHFP_ENABLED

    LOCAL_SRC_FILES += audio_extn/hfp.c

endif
@@ -126,7 +126,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS)),true) 
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INCALL_MUSIC)),true)

    LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

endif

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_VOIP)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_VOIP)),false)

    LOCAL_CFLAGS += -DCOMPRESS_VOIP_ENABLED

    LOCAL_SRC_FILES += voice_extn/compress_voip.c

endif

policy_hal/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_SPK)),true) 
LOCAL_CFLAGS += -DAUDIO_EXTN_HDMI_SPK_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),false)

LOCAL_CFLAGS += -DAUDIO_EXTN_AFE_PROXY_ENABLED

endif

post_proc/Android.mk

+1 −2
Original line number Diff line number Diff line 


LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),false)

    LOCAL_CFLAGS += -DAFE_PROXY_ENABLED

endif