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

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

Merge changes from topic "audio-hal-v4-tmp" 

* changes:
  Audio V4: Split system and vendor Audio.h
  Audio V4: Use the framework audio.h instead of the HAL's
parents f7a14c05 f8ad7f85

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",

        "libaudioutils_system",

        ],

    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

LOCAL_SHARED_LIBRARIES := libaaudio libaudioutils_system

LOCAL_MODULE := aaudio_loopback

include $(BUILD_EXECUTABLE)

media/libaaudio/src/core/AAudioStreamParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#define LOG_TAG "AAudioStreamParameters"

#include <utils/Log.h>

#include <hardware/audio.h>

#include <system/audio.h>



#include "AAudioStreamParameters.h"

media/libaaudio/src/utility/AAudioUtilities.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <sys/types.h>



#include <utils/Errors.h>

#include <hardware/audio.h>

#include <system/audio.h>



#include "aaudio/AAudio.h"

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",

        "libaudioutils_system",

        "libaudiomanager",

        "libmedia_helper",

        "libmediametrics",