diff options
| author | Dima Zavin <dima@android.com> | 2011-06-13 18:16:26 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-06-13 18:16:26 -0700 |
| commit | 7394a4f358fa9908a9f0a7c954b65c399f4268e6 (patch) | |
| tree | 76bde6cdaf308c987975d57a5a0d0794613ad65d | |
| parent | afcedc9e6f17d8213d9bd8f6c36643dcc816d0ef (diff) | |
| download | frameworks_av-7394a4f358fa9908a9f0a7c954b65c399f4268e6.zip frameworks_av-7394a4f358fa9908a9f0a7c954b65c399f4268e6.tar.gz frameworks_av-7394a4f358fa9908a9f0a7c954b65c399f4268e6.tar.bz2 | |
audio: update for audio/audio_policy header names/locations
Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 68cd188..89213b7 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -22,7 +22,7 @@ #include <media/IAudioFlinger.h> #include <system/audio.h> -#include <hardware/audio_policy.h> +#include <system/audio_policy.h> /* XXX: Should be include by all the users instead */ #include <media/AudioParameter.h> diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 09b2bfe..0fc8dbf 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -26,7 +26,7 @@ #include <binder/IInterface.h> #include <media/AudioSystem.h> -#include <hardware/audio_policy.h> +#include <system/audio_policy.h> namespace android { diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 6b4391b..37fe182 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -40,7 +40,7 @@ #include <cutils/bitops.h> #include <system/audio.h> -#include <hardware/audio_policy.h> +#include <system/audio_policy.h> #define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) #define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false )) diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index d4a8ddb..44df5b5 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -44,7 +44,7 @@ #include <private/media/AudioEffectShared.h> #include <system/audio.h> -#include <hardware/audio_hal.h> +#include <hardware/audio.h> #include "AudioMixer.h" #include "AudioFlinger.h" diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index f3371bf..1fad987 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -39,7 +39,7 @@ #include <binder/MemoryDealer.h> #include <system/audio.h> -#include <hardware/audio_hal.h> +#include <hardware/audio.h> #include "AudioBufferProvider.h" diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index dd91788..47ca3a0 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -36,8 +36,8 @@ #include <hardware/hardware.h> #include <system/audio.h> +#include <system/audio_policy.h> #include <hardware/audio_policy.h> -#include <hardware/audio_policy_hal.h> namespace android { diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index d9b5ada..b830120 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -23,8 +23,8 @@ #include <binder/BinderService.h> #include <system/audio.h> +#include <system/audio_policy.h> #include <hardware/audio_policy.h> -#include <hardware/audio_policy_hal.h> namespace android { |