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

Commit b9cba9b7 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev

parents cba53fbd 2dd4bdd7

services/audioflinger/ExtendedAudioBufferProvider.h→include/media/ExtendedAudioBufferProvider.h

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

#define ANDROID_EXTENDED_AUDIO_BUFFER_PROVIDER_H



#include "AudioBufferProvider.h"

#include <media/AudioBufferProvider.h>



namespace android {

services/audioflinger/AudioBufferProviderSource.h→include/media/nbaio/AudioBufferProviderSource.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define ANDROID_AUDIO_BUFFER_PROVIDER_SOURCE_H



#include "NBAIO.h"

#include "AudioBufferProvider.h"

#include <media/AudioBufferProvider.h>



namespace android {