Put the audio hal under hals
Test: Local build and boot
Change-Id: Icfe1f3a5dc39af6fd26f848dd643fcb2b985c915
diff --git a/guest/commands/audio/Android.mk b/guest/hals/audio/Android.mk
similarity index 100%
rename from guest/commands/audio/Android.mk
rename to guest/hals/audio/Android.mk
diff --git a/guest/commands/audio/audio_hal.cpp b/guest/hals/audio/audio_hal.cpp
similarity index 93%
rename from guest/commands/audio/audio_hal.cpp
rename to guest/hals/audio/audio_hal.cpp
index 1b05d40..ff19a32 100644
--- a/guest/commands/audio/audio_hal.cpp
+++ b/guest/hals/audio/audio_hal.cpp
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "guest/commands/audio/vsoc_audio.h"
+#include "guest/hals/audio/vsoc_audio.h"
-#include "guest/commands/audio/audio_hal.h"
+#include "guest/hals/audio/audio_hal.h"
#include "guest/libs/platform_support/api_level_fixes.h"
static hw_module_methods_t hal_module_methods = {
diff --git a/guest/commands/audio/audio_hal.h b/guest/hals/audio/audio_hal.h
similarity index 100%
rename from guest/commands/audio/audio_hal.h
rename to guest/hals/audio/audio_hal.h
diff --git a/guest/commands/audio/policy/Android.mk b/guest/hals/audio/policy/Android.mk
similarity index 100%
rename from guest/commands/audio/policy/Android.mk
rename to guest/hals/audio/policy/Android.mk
diff --git a/guest/commands/audio/policy/vsoc_audio_policy_hal.cpp b/guest/hals/audio/policy/vsoc_audio_policy_hal.cpp
similarity index 98%
rename from guest/commands/audio/policy/vsoc_audio_policy_hal.cpp
rename to guest/hals/audio/policy/vsoc_audio_policy_hal.cpp
index 047e27d..c0ca8f9 100644
--- a/guest/commands/audio/policy/vsoc_audio_policy_hal.cpp
+++ b/guest/hals/audio/policy/vsoc_audio_policy_hal.cpp
@@ -23,7 +23,7 @@
#include <system/audio_policy.h>
#include <hardware/audio_policy.h>
-#include "guest/commands/audio/policy/vsoc_audio_policy_hal.h"
+#include "guest/hals/audio/policy/vsoc_audio_policy_hal.h"
namespace cvd {
diff --git a/guest/commands/audio/policy/vsoc_audio_policy_hal.h b/guest/hals/audio/policy/vsoc_audio_policy_hal.h
similarity index 100%
rename from guest/commands/audio/policy/vsoc_audio_policy_hal.h
rename to guest/hals/audio/policy/vsoc_audio_policy_hal.h
diff --git a/guest/commands/audio/simulated_buffer.h b/guest/hals/audio/simulated_buffer.h
similarity index 100%
rename from guest/commands/audio/simulated_buffer.h
rename to guest/hals/audio/simulated_buffer.h
diff --git a/guest/commands/audio/vsoc_audio.cpp b/guest/hals/audio/vsoc_audio.cpp
similarity index 98%
rename from guest/commands/audio/vsoc_audio.cpp
rename to guest/hals/audio/vsoc_audio.cpp
index 68c896d..cfd7017 100644
--- a/guest/commands/audio/vsoc_audio.cpp
+++ b/guest/hals/audio/vsoc_audio.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "guest/commands/audio/audio_hal.h"
+#include "guest/hals/audio/audio_hal.h"
#include <stdio.h>
#include <stdlib.h>
@@ -28,9 +28,9 @@
#include "common/libs/fs/shared_select.h"
#include "common/libs/threads/cuttlefish_thread.h"
#include "common/libs/threads/thunkers.h"
-#include "guest/commands/audio/vsoc_audio.h"
-#include "guest/commands/audio/vsoc_audio_input_stream.h"
-#include "guest/commands/audio/vsoc_audio_output_stream.h"
+#include "guest/hals/audio/vsoc_audio.h"
+#include "guest/hals/audio/vsoc_audio_input_stream.h"
+#include "guest/hals/audio/vsoc_audio_output_stream.h"
#include "guest/libs/platform_support/api_level_fixes.h"
#include "guest/libs/remoter/remoter_framework_pkt.h"
diff --git a/guest/commands/audio/vsoc_audio.h b/guest/hals/audio/vsoc_audio.h
similarity index 98%
rename from guest/commands/audio/vsoc_audio.h
rename to guest/hals/audio/vsoc_audio.h
index 7e23bf7..4022888 100644
--- a/guest/commands/audio/vsoc_audio.h
+++ b/guest/hals/audio/vsoc_audio.h
@@ -20,9 +20,9 @@
#include "common/libs/fs/shared_fd.h"
#include "common/libs/threads/cuttlefish_thread.h"
-#include "guest/commands/audio/audio_hal.h"
-#include "guest/commands/audio/vsoc_audio_input_stream.h"
-#include "guest/commands/audio/vsoc_audio_message.h"
+#include "guest/hals/audio/audio_hal.h"
+#include "guest/hals/audio/vsoc_audio_input_stream.h"
+#include "guest/hals/audio/vsoc_audio_message.h"
#include "guest/libs/platform_support/api_level_fixes.h"
namespace cvd {
diff --git a/guest/commands/audio/vsoc_audio_input_stream.cpp b/guest/hals/audio/vsoc_audio_input_stream.cpp
similarity index 97%
rename from guest/commands/audio/vsoc_audio_input_stream.cpp
rename to guest/hals/audio/vsoc_audio_input_stream.cpp
index 9802d2a..547689b 100644
--- a/guest/commands/audio/vsoc_audio_input_stream.cpp
+++ b/guest/hals/audio/vsoc_audio_input_stream.cpp
@@ -23,9 +23,9 @@
#include "common/libs/auto_resources/auto_resources.h"
#include "common/libs/threads/thunkers.h"
-#include "guest/commands/audio/audio_hal.h"
-#include "guest/commands/audio/vsoc_audio.h"
-#include "guest/commands/audio/vsoc_audio_input_stream.h"
+#include "guest/hals/audio/audio_hal.h"
+#include "guest/hals/audio/vsoc_audio.h"
+#include "guest/hals/audio/vsoc_audio_input_stream.h"
#include "guest/libs/platform_support/api_level_fixes.h"
namespace cvd {
diff --git a/guest/commands/audio/vsoc_audio_input_stream.h b/guest/hals/audio/vsoc_audio_input_stream.h
similarity index 97%
rename from guest/commands/audio/vsoc_audio_input_stream.h
rename to guest/hals/audio/vsoc_audio_input_stream.h
index 1f8cb4d..5e7cc63 100644
--- a/guest/commands/audio/vsoc_audio_input_stream.h
+++ b/guest/hals/audio/vsoc_audio_input_stream.h
@@ -17,9 +17,9 @@
#include <memory>
-#include "guest/commands/audio/audio_hal.h"
-#include "guest/commands/audio/simulated_buffer.h"
-#include "guest/commands/audio/vsoc_audio_message.h"
+#include "guest/hals/audio/audio_hal.h"
+#include "guest/hals/audio/simulated_buffer.h"
+#include "guest/hals/audio/vsoc_audio_message.h"
namespace cvd {
diff --git a/guest/commands/audio/vsoc_audio_message.cpp b/guest/hals/audio/vsoc_audio_message.cpp
similarity index 92%
rename from guest/commands/audio/vsoc_audio_message.cpp
rename to guest/hals/audio/vsoc_audio_message.cpp
index 30ef532..2cbfe4e 100644
--- a/guest/commands/audio/vsoc_audio_message.cpp
+++ b/guest/hals/audio/vsoc_audio_message.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "guest/commands/audio/vsoc_audio_message.h"
+#include "guest/hals/audio/vsoc_audio_message.h"
const char* gce_audio_message::kAudioHALSocketName =
"/var/run/media/audio_hal_socket";
diff --git a/guest/commands/audio/vsoc_audio_message.h b/guest/hals/audio/vsoc_audio_message.h
similarity index 100%
rename from guest/commands/audio/vsoc_audio_message.h
rename to guest/hals/audio/vsoc_audio_message.h
diff --git a/guest/commands/audio/vsoc_audio_output_stream.cpp b/guest/hals/audio/vsoc_audio_output_stream.cpp
similarity index 98%
rename from guest/commands/audio/vsoc_audio_output_stream.cpp
rename to guest/hals/audio/vsoc_audio_output_stream.cpp
index f32a676..cd86a5c 100644
--- a/guest/commands/audio/vsoc_audio_output_stream.cpp
+++ b/guest/hals/audio/vsoc_audio_output_stream.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "guest/commands/audio/vsoc_audio_message.h"
+#include "guest/hals/audio/vsoc_audio_message.h"
#include <stdio.h>
#include <stdlib.h>
@@ -27,9 +27,9 @@
#include "common/libs/auto_resources/auto_resources.h"
#include "common/libs/threads/thunkers.h"
#include "common/libs/time/monotonic_time.h"
-#include "guest/commands/audio/audio_hal.h"
-#include "guest/commands/audio/vsoc_audio.h"
-#include "guest/commands/audio/vsoc_audio_output_stream.h"
+#include "guest/hals/audio/audio_hal.h"
+#include "guest/hals/audio/vsoc_audio.h"
+#include "guest/hals/audio/vsoc_audio_output_stream.h"
#include "guest/libs/platform_support/api_level_fixes.h"
#include "guest/libs/remoter/remoter_framework_pkt.h"
diff --git a/guest/commands/audio/vsoc_audio_output_stream.h b/guest/hals/audio/vsoc_audio_output_stream.h
similarity index 98%
rename from guest/commands/audio/vsoc_audio_output_stream.h
rename to guest/hals/audio/vsoc_audio_output_stream.h
index ecd609f..b5cc9f0 100644
--- a/guest/commands/audio/vsoc_audio_output_stream.h
+++ b/guest/hals/audio/vsoc_audio_output_stream.h
@@ -17,9 +17,9 @@
#include <memory>
-#include "guest/commands/audio/audio_hal.h"
-#include "guest/commands/audio/simulated_buffer.h"
-#include "guest/commands/audio/vsoc_audio_message.h"
+#include "guest/hals/audio/audio_hal.h"
+#include "guest/hals/audio/simulated_buffer.h"
+#include "guest/hals/audio/vsoc_audio_message.h"
namespace cvd {