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

Commit 34abab10 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 fe4e4db4 07be14fb

media/libaaudio/examples/loopback/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ cc_test { 
    static_libs: ["libsndfile"],

    shared_libs: [

        "libaaudio",

        "libaudioutils_system",

        "libaudioutils",

        ],

    header_libs: ["libaaudio_example_utils"],

}

media/libaaudio/examples/loopback/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ LOCAL_C_INCLUDES := \ 
LOCAL_SRC_FILES:= ../src/loopback.cpp

LOCAL_CFLAGS := -Wall -Werror

LOCAL_STATIC_LIBRARIES := libsndfile

LOCAL_SHARED_LIBRARIES := libaaudio libaudioutils_system

LOCAL_SHARED_LIBRARIES := libaaudio libaudioutils

LOCAL_MODULE := aaudio_loopback

include $(BUILD_EXECUTABLE)

media/libaudioclient/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ cc_library_shared { 
        "libutils",

        "libbinder",

        "libdl",

        "libaudioutils_system",

        "libaudioutils",

        "libaudiomanager",

        "libmedia_helper",

        "libmediametrics",

media/libaudiohal/2.0/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ cc_library_shared { 
        "DevicesFactoryHalHybrid.cpp",

        "DevicesFactoryHalLocal.cpp",

        "StreamHalLocal.cpp",



        "ConversionHelperHidl.cpp",

        "DeviceHalHidl.cpp",

        "DevicesFactoryHalHidl.cpp",
@@ -13,7 +14,6 @@ cc_library_shared { 
        "EffectHalHidl.cpp",

        "EffectsFactoryHalHidl.cpp",

        "StreamHalHidl.cpp",

        "HidlUtils.cpp",

    ],



    export_include_dirs: ["."],
@@ -24,7 +24,7 @@ cc_library_shared { 
    ],

    shared_libs: [

        "libaudiohal_deathhandler",

        "libaudioutils_system",

        "libaudioutils",

        "libcutils",

        "liblog",

        "libutils",
@@ -37,6 +37,7 @@ cc_library_shared { 
        "libhidltransport",

        "android.hardware.audio@2.0",

        "android.hardware.audio.common@2.0",

        "android.hardware.audio.common@2.0-util",

        "android.hardware.audio.effect@2.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",
@@ -44,8 +45,7 @@ cc_library_shared { 
        "libmediautils",

    ],

    header_libs: [

        "libaudiohal_headers",

        "libaudiohal_util",

        "libaudiohal_headers"

    ],



    export_shared_lib_headers: [

media/libaudiohal/2.0/EffectHalHidl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
//#define LOG_NDEBUG 0



#include <hwbinder/IPCThreadState.h>

#include <media/EffectsFactoryApi.h>

#include <utils/Log.h>



#include "ConversionHelperHidl.h"