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

Commit f76dd3ab authored by Dima Zavin's avatar Dima Zavin Committed by Android (Google) Code Review
Browse files

Merge "update for new audio.h header location"

parents 674b595f 34bb419e

cmds/stagefright/audioloop.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <media/stagefright/OMXClient.h>

#include <media/stagefright/OMXCodec.h>



#include <hardware/audio.h>

#include <system/audio.h>



using namespace android;

core/jni/android_media_AudioRecord.cpp

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


#include <cutils/bitops.h>



#include <hardware/audio.h>

#include <system/audio.h>



// ----------------------------------------------------------------------------

core/jni/android_media_AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <media/AudioSystem.h>

#include <media/AudioTrack.h>



#include <hardware/audio.h>

#include <system/audio.h>

#include <hardware/audio_policy.h>



// ----------------------------------------------------------------------------

core/jni/android_media_AudioTrack.cpp

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


#include <cutils/bitops.h>



#include <hardware/audio.h>

#include <system/audio.h>



// ----------------------------------------------------------------------------

include/media/AudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <binder/IMemory.h>

#include <utils/threads.h>



#include <hardware/audio.h>

#include <system/audio.h>



namespace android {