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

Commit 3f489adb authored by Kevin Rocard's avatar Kevin Rocard Committed by Android (Google) Code Review
Browse files

Merge "Revert "Audio V4: Split system and vendor Audio.h""

parents c6ce74e1 bae0dcb8

hal/Android.mk

+2 −5
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ LOCAL_C_INCLUDES += \ 
	external/tinyalsa/include \

	external/tinycompress/include \

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

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

	$(LOCAL_PATH)/$(AUDIO_PLATFORM) \

	$(LOCAL_PATH)/audio_extn \

	$(LOCAL_PATH)/voice_extn \
@@ -177,11 +178,7 @@ LOCAL_SHARED_LIBRARIES += libbase libhidlbase libhwbinder libutils android.hardw 


LOCAL_SRC_FILES += audio_perf.cpp



LOCAL_HEADER_LIBRARIES += \

    libhardware_headers \

    android.hardware.audio.common.legacy@2.0 \

    android.hardware.audio.effect.legacy@2.0 \

    android.hardware.soundtrigger.legacy@2.0 \

LOCAL_HEADER_LIBRARIES += libhardware_headers



LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)

post_proc/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ LOCAL_MODULE:= libqcompostprocbundle 


LOCAL_C_INCLUDES := \

	external/tinyalsa/include \

	$(call include-path-for, audio-effects)



LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

LOCAL_HEADER_LIBRARIES += android.hardware.audio.effect.legacy@2.0

include $(BUILD_SHARED_LIBRARY)

endif
@@ -66,10 +66,10 @@ LOCAL_PROPRIETARY_MODULE := true 


LOCAL_C_INCLUDES := \

        hardware/qcom/audio/hal \

	$(call include-path-for, audio-effects)



LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

LOCAL_HEADER_LIBRARIES += android.hardware.audio.effect.legacy@2.0

include $(BUILD_SHARED_LIBRARY)



endif

visualizer/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ LOCAL_CFLAGS += \ 
    -Werror \

    -Wno-unused-variable \



LOCAL_HEADER_LIBRARIES := \

    libhardware_headers \

    android.hardware.audio.effect.legacy@2.0

LOCAL_HEADER_LIBRARIES := libhardware_headers



LOCAL_MODULE_RELATIVE_PATH := soundfx

LOCAL_MODULE:= libqcomvisualizer
@@ -51,6 +49,7 @@ LOCAL_PROPRIETARY_MODULE := true 


LOCAL_C_INCLUDES := \

	external/tinyalsa/include \

	$(call include-path-for, audio-effects)



LOCAL_HEADER_LIBRARIES += libsystem_headers

include $(BUILD_SHARED_LIBRARY)

voice_processing/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ LOCAL_CFLAGS += \ 
    -Wno-unused-function \

    -Wno-unused-variable \



LOCAL_C_INCLUDES += \

    $(call include-path-for, audio-effects)



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils
@@ -26,8 +29,5 @@ LOCAL_SHARED_LIBRARIES += libdl 


LOCAL_CFLAGS += -fvisibility=hidden



LOCAL_HEADER_LIBRARIES += \

    libhardware_headers \

    android.hardware.audio.effect.legacy@2.0 \



LOCAL_HEADER_LIBRARIES += libhardware_headers

include $(BUILD_SHARED_LIBRARY)