update for new audio.h header location
Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
diff --git a/cmds/stagefright/audioloop.cpp b/cmds/stagefright/audioloop.cpp
index ceb254f..858681f 100644
--- a/cmds/stagefright/audioloop.cpp
+++ b/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;
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index 0afc523..50d9ca1 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -33,7 +33,7 @@
#include <cutils/bitops.h>
-#include <hardware/audio.h>
+#include <system/audio.h>
// ----------------------------------------------------------------------------
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 09c0953..246c0e5 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/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>
// ----------------------------------------------------------------------------
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index e3b2f2c..bd70dad 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -35,7 +35,7 @@
#include <cutils/bitops.h>
-#include <hardware/audio.h>
+#include <system/audio.h>
// ----------------------------------------------------------------------------
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h
index def3612..baab2e8 100644
--- a/include/media/AudioRecord.h
+++ b/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 {
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index eb61a87..68cd188 100644
--- a/include/media/AudioSystem.h
+++ b/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 */
diff --git a/include/media/MediaRecorderBase.h b/include/media/MediaRecorderBase.h
index 5fe7722..7e22a24 100644
--- a/include/media/MediaRecorderBase.h
+++ b/include/media/MediaRecorderBase.h
@@ -20,7 +20,7 @@
#include <media/mediarecorder.h>
-#include <hardware/audio.h>
+#include <system/audio.h>
namespace android {
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h
index 20a9e16..19bd31b 100644
--- a/include/media/stagefright/AudioSource.h
+++ b/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 {
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 66cb71c..2f7d7ee 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/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>
// ----------------------------------------------------------------------------
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index bfbf04a..3ea13a6 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/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"
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 8438714..446e3df 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/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 ))
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index e08a55b..8a180d8 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/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
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 2673df9..7520ed9 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/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 ))
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp
index 88a9ae0..9fbcee0 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -25,7 +25,7 @@
#include <media/IAudioPolicyService.h>
-#include <hardware/audio.h>
+#include <system/audio.h>
namespace android {
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 28e07ff..7b7ba74 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/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 {
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 3b2cf10..d51c946 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/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>
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index 6c4071f..8bab471 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/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 {
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 5a47384..29cc019 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/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"
diff --git a/media/libmediaplayerservice/MidiFile.cpp b/media/libmediaplayerservice/MidiFile.cpp
index 37a3db3..589c625 100644
--- a/media/libmediaplayerservice/MidiFile.cpp
+++ b/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"
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index c1687c4..f21474f 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/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"
diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h
index c3e6d65..15ef6e24 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.h
+++ b/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 {
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index f8ad5bb..10beee9 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/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"
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 22e5116..43be6fe 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/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"
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp
index eebc1b3..ef8d957 100644
--- a/services/audioflinger/AudioPolicyService.cpp
+++ b/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>
diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h
index 01e592b..d9b5ada 100644
--- a/services/audioflinger/AudioPolicyService.h
+++ b/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>
diff --git a/voip/jni/rtp/AudioGroup.cpp b/voip/jni/rtp/AudioGroup.cpp
index 8b31996..85ed1c8 100644
--- a/voip/jni/rtp/AudioGroup.cpp
+++ b/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"