From 34bb419e5946ab28112e9e27a4d1b3928d31e0e2 Mon Sep 17 00:00:00 2001
From: Dima Zavin <dima@android.com>
Date: Wed, 11 May 2011 14:15:23 -0700
Subject: [PATCH] update for new audio.h header location

Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
---
 cmds/stagefright/audioloop.cpp                      | 2 +-
 core/jni/android_media_AudioRecord.cpp              | 2 +-
 core/jni/android_media_AudioSystem.cpp              | 2 +-
 core/jni/android_media_AudioTrack.cpp               | 2 +-
 include/media/AudioRecord.h                         | 2 +-
 include/media/AudioSystem.h                         | 2 +-
 include/media/MediaRecorderBase.h                   | 2 +-
 include/media/stagefright/AudioSource.h             | 2 +-
 media/jni/android_media_MediaRecorder.cpp           | 2 +-
 media/jni/soundpool/SoundPool.cpp                   | 2 +-
 media/libmedia/AudioRecord.cpp                      | 2 +-
 media/libmedia/AudioSystem.cpp                      | 2 +-
 media/libmedia/AudioTrack.cpp                       | 2 +-
 media/libmedia/IAudioPolicyService.cpp              | 2 +-
 media/libmedia/mediaplayer.cpp                      | 2 +-
 media/libmediaplayerservice/MediaPlayerService.cpp  | 2 +-
 media/libmediaplayerservice/MediaPlayerService.h    | 2 +-
 media/libmediaplayerservice/MediaRecorderClient.cpp | 2 +-
 media/libmediaplayerservice/MidiFile.cpp            | 2 +-
 media/libmediaplayerservice/StagefrightRecorder.cpp | 2 +-
 media/libmediaplayerservice/StagefrightRecorder.h   | 2 +-
 services/audioflinger/AudioFlinger.cpp              | 2 +-
 services/audioflinger/AudioFlinger.h                | 2 +-
 services/audioflinger/AudioPolicyService.cpp        | 2 +-
 services/audioflinger/AudioPolicyService.h          | 2 +-
 voip/jni/rtp/AudioGroup.cpp                         | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/cmds/stagefright/audioloop.cpp b/cmds/stagefright/audioloop.cpp
index ceb254fb411ad..858681f6ce452 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 0afc523adfdb3..50d9ca1d9e5dd 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 09c0953e1a4df..246c0e506bd65 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 e3b2f2c10e9ea..bd70dad7de21c 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 def3612ec4c93..baab2e89bd3ee 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 eb61a876c6997..68cd188358e93 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 5fe77221fbdfc..7e22a24c34834 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 20a9e16f20737..19bd31b7e594d 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 66cb71cc2be76..2f7d7ee121ea9 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 bfbf04a926c0e..3ea13a69258ba 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 8438714dac28f..446e3dfca8cbb 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 e08a55be7f966..8a180d8256863 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 2673df9447588..7520ed92349e8 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 88a9ae0567ccf..9fbcee0e09b70 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 28e07ff385a48..7b7ba74f9a84e 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 3b2cf10c5cbb1..d51c946d70111 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 6c4071f2b2632..8bab471fac6be 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 5a47384fc780f..29cc019611ffe 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 37a3db3cfde05..589c6258a4aee 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 c1687c4f95f9a..f21474f7dfb35 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 c3e6d65406c68..15ef6e24143dd 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 f8ad5bbd2102b..10beee968c7d0 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 22e5116ab275a..43be6fe37239c 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 eebc1b3464012..ef8d957711f03 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 01e592bc7fcc6..d9b5ada5671c6 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 8b31996e3b297..85ed1c806c2c0 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"