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

Commit 7a18f3e2 authored by Joel Dey's avatar Joel Dey
Browse files

[AUDIO-HAL] Enable VA flag and libqti-tinycompress 



-Enable the Value add flag
-Use libqti-tinycompress for AUTO target

Change-Id: I058028168fa751af1d5a48b6bbd738915d9de428
Signed-off-by: default avatarJoel Dey <quic_jdey@quicinc.com>
parent 4269c5c9

configs/audio_vendor_product.mk

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ PRODUCT_PACKAGES_DEBUG += $(MM_AUDIO_DBG) 
# audio specific

# ------

TARGET_USES_AOSP := true

TARGET_USES_AOSP_FOR_AUDIO := true

TARGET_USES_AOSP_FOR_AUDIO := false



# sdm845 specific rules

ifeq ($(TARGET_BOARD_PLATFORM),sdm845)

hal/Android.mk

+10 −2
Original line number Diff line number Diff line
@@ -8,6 +8,14 @@ LOCAL_ARM_MODE := arm 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(TARGET_BOARD_AUTO),true)

LIBRARY_TINYCOMPRESS := libtinycompress

LIBRARY_TINYCOMPRESS_INC := external/tinycompress/include

else

LIBRARY_TINYCOMPRESS := libqti-tinycompress

LIBRARY_TINYCOMPRESS_INC := $(TOP)/vendor/qcom/opensource/tinycompress/include

endif



ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 sdmshrike msmnile kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET) lito atoll bengal,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974
@@ -166,7 +174,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libcutils \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libaudioutils \
@@ -177,7 +185,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES += \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    system/media/audio_utils/include \

    external/expat/lib \

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

hal/audio_extn/Android.mk

+40 −32
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ else 
  AUDIO_KERNEL_INC := $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

endif # BOARD_OPENSOURCE_DIR



ifneq ($(TARGET_BOARD_AUTO),true)

LIBRARY_TINYCOMPRESS := libtinycompress

LIBRARY_TINYCOMPRESS_INC := external/tinycompress/include

else

LIBRARY_TINYCOMPRESS := libqti-tinycompress

LIBRARY_TINYCOMPRESS_INC := $(TOP)/vendor/qcom/opensource/tinycompress/include

endif



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

#          Build SND_MONITOR LIB

#--------------------------------------------
@@ -34,14 +42,14 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat



LOCAL_C_INCLUDES := \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    system/media/audio_utils/include \

    external/expat/lib \

    $(call include-path-for, audio-route) \
@@ -107,14 +115,14 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat



LOCAL_C_INCLUDES := \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    system/media/audio_utils/include \

    external/expat/lib \

    $(call include-path-for, audio-route) \
@@ -176,7 +184,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat \
@@ -186,7 +194,7 @@ LOCAL_C_INCLUDES := \ 
    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -247,14 +255,14 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat



LOCAL_C_INCLUDES := \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    system/media/audio_utils/include \

    external/expat/lib \

    $(call include-path-for, audio-route) \
@@ -320,14 +328,14 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat



LOCAL_C_INCLUDES := \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    system/media/audio_utils/include \

    external/expat/lib \

    $(call include-path-for, audio-route) \
@@ -401,7 +409,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES := \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    system/media/audio_utils/include \

    external/expat/lib \

    $(call include-path-for, audio-route) \
@@ -464,7 +472,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat
@@ -473,7 +481,7 @@ LOCAL_C_INCLUDES := \ 
    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -545,13 +553,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexpat \

    liblog \

    libtinyalsa \

    libtinycompress

    $(LIBRARY_TINYCOMPRESS)



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -616,13 +624,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexpat \

    liblog \

    libtinyalsa \

    libtinycompress

    $(LIBRARY_TINYCOMPRESS)



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -693,13 +701,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexpat \

    liblog \

    libtinyalsa \

    libtinycompress

    $(LIBRARY_TINYCOMPRESS)



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -764,13 +772,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexpat \

    liblog \

    libtinyalsa \

    libtinycompress

    $(LIBRARY_TINYCOMPRESS)



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -833,13 +841,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexpat \

    liblog \

    libtinyalsa \

    libtinycompress

    $(LIBRARY_TINYCOMPRESS)



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(TARGET_OUT_HEADERS)/mm-audio/audio-parsers \
@@ -917,7 +925,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhidlbase \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libutils \



LOCAL_STATIC_LIBRARIES := \
@@ -927,7 +935,7 @@ LOCAL_C_INCLUDES := \ 
    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -982,13 +990,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libexpat \

    liblog \

    libtinyalsa \

    libtinycompress

    $(LIBRARY_TINYCOMPRESS)



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -1041,7 +1049,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat
@@ -1050,7 +1058,7 @@ LOCAL_C_INCLUDES := \ 
    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -1107,7 +1115,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    liblog \

    libtinyalsa \

    libtinycompress \

    $(LIBRARY_TINYCOMPRESS) \

    libaudioroute \

    libdl \

    libexpat
@@ -1116,7 +1124,7 @@ LOCAL_C_INCLUDES := \ 
    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

    $(call include-path-for, audio-route) \
@@ -1183,7 +1191,7 @@ LOCAL_C_INCLUDES := \ 
    $(PRIMARY_HAL_PATH) \

    $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \

    external/tinyalsa/include \

    external/tinycompress/include \

    $(LIBRARY_TINYCOMPRESS_INC) \

    external/expat/lib \

    system/media/audio_utils/include \

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