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

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

Merge "audio-hal: Fix build error with VA and AOSP tinycompress"

parents 440628af 31dbdb82

hal/Android.mk

100755 → 100644
+7 −1
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ ifeq ($(TARGET_BOARD_AUTO),true) 
  LOCAL_CFLAGS += -DPLATFORM_AUTO

endif



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

  LIBRARY_TINYCOMPRESS := libtinycompress

  LIBRARY_TINYCOMPRESS_INC := external/tinycompress/include

  LOCAL_CFLAGS += -DENABLE_AUDIO_LEGACY_PURE

endif



ifeq ($(TARGET_SUPPORTS_WEARABLES),true)

   LOCAL_CFLAGS += -DENABLE_HFP_CALIBRATION

endif

hal/audio_extn/Android.mk

+9 −4
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ LIBRARY_TINYCOMPRESS := libqti-tinycompress 
  LIBRARY_TINYCOMPRESS_INC := $(TOP)/vendor/qcom/opensource/tinycompress/include

endif



ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)

  LIBRARY_TINYCOMPRESS := libtinycompress

  LIBRARY_TINYCOMPRESS_INC := external/tinycompress/include

  LOCAL_CFLAGS += -DENABLE_AUDIO_LEGACY_PURE

endif

#--------------------------------------------

#          Build SND_MONITOR LIB

#--------------------------------------------

hal/audio_extn/audio_extn.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int audio_extn_parse_compress_metadata(struct stream_out *out, 
#define AUDIO_OUTPUT_BIT_WIDTH ((config->offload_info.bit_width == 32) ? 24\

                                   :config->offload_info.bit_width)



#ifndef ENABLE_EXTENDED_COMPRESS_FORMAT

#if !defined(ENABLE_EXTENDED_COMPRESS_FORMAT) || defined(ENABLE_AUDIO_LEGACY_PURE)

#define compress_set_metadata(compress, metadata) (0)

#define compress_get_metadata(compress, metadata) (0)

#define compress_set_next_track_param(compress, codec_options) (0)