Merge "update for new audio.h header location"

cmds/stagefright/audioloop.cpp

@@ -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

@@ -33,7 +33,7 @@
 
 #include <cutils/bitops.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 // ----------------------------------------------------------------------------
 

core/jni/android_media_AudioSystem.cpp

@@ -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

@@ -35,7 +35,7 @@
 
 #include <cutils/bitops.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 // ----------------------------------------------------------------------------
 

include/media/AudioRecord.h

@@ -30,7 +30,7 @@
 #include <binder/IMemory.h>
 #include <utils/threads.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

include/media/AudioSystem.h

@@ -21,7 +21,7 @@
 #include <utils/threads.h>
 #include <media/IAudioFlinger.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <hardware/audio_policy.h>
 
 /* XXX: Should be include by all the users instead */

include/media/MediaRecorderBase.h

@@ -20,7 +20,7 @@
 
 #include <media/mediarecorder.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

include/media/stagefright/AudioSource.h

@@ -24,7 +24,7 @@
 #include <media/stagefright/MediaBuffer.h>
 #include <utils/List.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

media/jni/android_media_MediaRecorder.cpp

@@ -33,7 +33,7 @@
 #include "JNIHelp.h"
 #include "android_runtime/AndroidRuntime.h"
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 // ----------------------------------------------------------------------------
 

media/jni/soundpool/SoundPool.cpp

@@ -27,7 +27,7 @@
 #include <media/AudioTrack.h>
 #include <media/mediaplayer.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 #include "SoundPool.h"
 #include "SoundPoolThread.h"

media/libmedia/AudioRecord.cpp

@@ -37,7 +37,7 @@
 #include <utils/Timers.h>
 #include <utils/Atomic.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <cutils/bitops.h>
 
 #define LIKELY( exp )       (__builtin_expect( (exp) != 0, true  ))

media/libmedia/AudioSystem.cpp

@@ -23,7 +23,7 @@
 #include <media/IAudioPolicyService.h>
 #include <math.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 // ----------------------------------------------------------------------------
 // the sim build doesn't have gettid

media/libmedia/AudioTrack.cpp

@@ -39,7 +39,7 @@
 
 #include <cutils/bitops.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <hardware/audio_policy.h>
 
 #define LIKELY( exp )       (__builtin_expect( (exp) != 0, true  ))

media/libmedia/IAudioPolicyService.cpp

@@ -25,7 +25,7 @@
 
 #include <media/IAudioPolicyService.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

media/libmedia/mediaplayer.cpp

@@ -37,7 +37,7 @@
 #include <utils/KeyedVector.h>
 #include <utils/String8.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

media/libmediaplayerservice/MediaPlayerService.cpp

@@ -53,7 +53,7 @@
 #include <media/AudioTrack.h>
 #include <media/MemoryLeakTrackUtil.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 #include <private/android_filesystem_config.h>
 

media/libmediaplayerservice/MediaPlayerService.h

@@ -30,7 +30,7 @@
 #include <media/MediaPlayerInterface.h>
 #include <media/Metadata.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

media/libmediaplayerservice/MediaRecorderClient.cpp

@@ -35,7 +35,7 @@
 
 #include <media/AudioTrack.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 #include "MediaRecorderClient.h"
 #include "MediaPlayerService.h"

media/libmediaplayerservice/MidiFile.cpp

@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 #include "MidiFile.h"
 

media/libmediaplayerservice/StagefrightRecorder.cpp

@@ -47,7 +47,7 @@
 #include <ctype.h>
 #include <unistd.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 #include "ARTPWriter.h"
 

media/libmediaplayerservice/StagefrightRecorder.h

@@ -22,7 +22,7 @@
 #include <camera/CameraParameters.h>
 #include <utils/String8.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 namespace android {
 

services/audioflinger/AudioFlinger.cpp

@@ -43,7 +43,7 @@
 #include <private/media/AudioTrackShared.h>
 #include <private/media/AudioEffectShared.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <hardware/audio_hal.h>
 
 #include "AudioMixer.h"

services/audioflinger/AudioFlinger.h

@@ -38,7 +38,7 @@
 #include <binder/BinderService.h>
 #include <binder/MemoryDealer.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <hardware/audio_hal.h>
 
 #include "AudioBufferProvider.h"

services/audioflinger/AudioPolicyService.cpp

@@ -35,7 +35,7 @@
 #include <hardware_legacy/power.h>
 
 #include <hardware/hardware.h>
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <hardware/audio_policy.h>
 #include <hardware/audio_policy_hal.h>
 

services/audioflinger/AudioPolicyService.h

@@ -22,7 +22,7 @@
 #include <utils/Vector.h>
 #include <binder/BinderService.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 #include <hardware/audio_policy.h>
 #include <hardware/audio_policy_hal.h>
 

voip/jni/rtp/AudioGroup.cpp

@@ -41,7 +41,7 @@
 #include <media/AudioTrack.h>
 #include <media/mediarecorder.h>
 
-#include <hardware/audio.h>
+#include <system/audio.h>
 
 #include "jni.h"
 #include "JNIHelp.h"