audio: update for audio/audio_policy header names/locations

Change-Id: I7a414a2e173c2bfd72ae70d57b251fa0d4dbdfa0
Signed-off-by: Dima Zavin <dima@android.com>

diff --git a/audio/AudioPolicyCompatClient.cpp b/audio/AudioPolicyCompatClient.cpp
index 97bc1eb..08c31c5 100644 (file)
--- a/audio/AudioPolicyCompatClient.cpp
+++ b/audio/AudioPolicyCompatClient.cpp
@@ -21,8 +21,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>
 
 #include <hardware_legacy/AudioSystemLegacy.h>
 

diff --git a/audio/AudioPolicyCompatClient.h b/audio/AudioPolicyCompatClient.h
index 4b4c004..4feee37 100644 (file)
--- a/audio/AudioPolicyCompatClient.h
+++ b/audio/AudioPolicyCompatClient.h
@@ -18,8 +18,8 @@
 #define ANDROID_AUDIOPOLICYCLIENTLEGACY_H
 
 #include <system/audio.h>
+#include <system/audio_policy.h>
 #include <hardware/audio_policy.h>
-#include <hardware/audio_policy_hal.h>
 
 #include <hardware_legacy/AudioSystemLegacy.h>
 #include <hardware_legacy/AudioPolicyInterface.h>

diff --git a/audio/audio_hw_hal.cpp b/audio/audio_hw_hal.cpp
index 0672537..4fb4a8e 100644 (file)
--- a/audio/audio_hw_hal.cpp
+++ b/audio/audio_hw_hal.cpp
@@ -21,7 +21,7 @@
 
 #include <hardware/hardware.h>
 #include <system/audio.h>
-#include <hardware/audio_hal.h>
+#include <hardware/audio.h>
 
 #include <hardware_legacy/AudioHardwareInterface.h>
 #include <hardware_legacy/AudioSystemLegacy.h>

diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp
index 77d076d..b9ec3da 100644 (file)
--- a/audio/audio_policy_hal.cpp
+++ b/audio/audio_policy_hal.cpp
@@ -21,8 +21,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>
 
 #include <hardware_legacy/AudioPolicyInterface.h>
 #include <hardware_legacy/AudioSystemLegacy.h>

diff --git a/include/hardware_legacy/AudioHardwareInterface.h b/include/hardware_legacy/AudioHardwareInterface.h
index 5ab5fdb..fff7fc9 100644 (file)
--- a/include/hardware_legacy/AudioHardwareInterface.h
+++ b/include/hardware_legacy/AudioHardwareInterface.h
@@ -29,7 +29,7 @@
 #include <hardware_legacy/AudioSystemLegacy.h>
 
 #include <system/audio.h>
-#include <hardware/audio_hal.h>
+#include <hardware/audio.h>
 
 #include <cutils/bitops.h>
 

diff --git a/include/hardware_legacy/AudioSystemLegacy.h b/include/hardware_legacy/AudioSystemLegacy.h
index ea32a02..2892388 100644 (file)
--- a/include/hardware_legacy/AudioSystemLegacy.h
+++ b/include/hardware_legacy/AudioSystemLegacy.h
@@ -21,7 +21,7 @@
 #include <media/AudioParameter.h>
 
 #include <system/audio.h>
-#include <hardware/audio_policy.h>
+#include <system/audio_policy.h>
 
 namespace android_audio_legacy {