commit 8fee89fe49f658cc5c3e08be780af26a11a42ac0
author qctecmdr <qctecmdr@localhost> Wed Sep 14 23:58:21 2022 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 14 23:58:21 2022 -0700
tree bd0fe151a05f6edf9deaa02b4c4105750e5caea6
parent 440628afd8f03f3ee804a40179ecd2e8c375a87e
parent 31dbdb821253f7c792d061ef6581ae5a54b15123

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

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
old mode 100755
new mode 100644
index cd67541..011196f
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -134,6 +134,12 @@
   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
@@ -147,7 +153,7 @@
 LOCAL_HEADER_LIBRARIES := libhardware_headers
 
 ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
-LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+  LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
 endif
 
 LOCAL_SRC_FILES := \

hal/audio_extn/Android.mk

diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index d43bbe7..c124e90 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -8,13 +8,18 @@
 endif # BOARD_OPENSOURCE_DIR
 
 ifneq ($(TARGET_BOARD_AUTO),true)
-LIBRARY_TINYCOMPRESS := libtinycompress
-LIBRARY_TINYCOMPRESS_INC := external/tinycompress/include
+  LIBRARY_TINYCOMPRESS := libtinycompress
+  LIBRARY_TINYCOMPRESS_INC := external/tinycompress/include
 else
-LIBRARY_TINYCOMPRESS := libqti-tinycompress
-LIBRARY_TINYCOMPRESS_INC := $(TOP)/vendor/qcom/opensource/tinycompress/include
+  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

diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index 75ef7f2..f35a9d6 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -112,7 +112,7 @@
 #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)