Audio V4: Rename audio/device to audio/core

The name device has already too many meaning, thus rename the main audio
api to core.

Bug: 38184704
Test: compile
Change-Id: I178dfef05af8f8579196affbe2cbc5f6c3f9af55
Signed-off-by: Kevin Rocard <krocard@google.com>

audio/README

@@ -1,36 +1,36 @@
 Directory structure of the audio HIDL related code.
 
 audio
-|-- 2.0              <== legacy 2.0 device HIDL (.hal) can not be moved to fit
+|-- 2.0              <== legacy 2.0 core HIDL (.hal) can not be moved to fit
 |                        the directory structure because already published
 |
-|-- common           <== code common to audio device and effect API
+|-- common           <== code common to audio core and effect API
 |   |-- 2.0
 |   |   |-- default  <== code that wraps the legacy API
-|   |   `-- vts      <== vts of 2.0 device and effect API common code
+|   |   `-- vts      <== vts of 2.0 core and effect API common code
 |   |-- 4.0
 |   |   |-- default
 |   |   `-- vts
 |   |-- ...          <== The future versions should continue this structure
 |   |   |-- default
 |   |   `-- vts
-|   `-- all_versions <== code common to all version of both device and effect API
+|   `-- all_versions <== code common to all version of both core and effect API
 |       |-- default
-|       `-- vts      <== vts of device and effect API common version independent code
+|       `-- vts      <== vts of core and effect API common version independent code
 |
-|-- device           <== code relative to the device API
-|   |-- 2.0          <== 2.0 device API code (except .hal, see audio/2.0)
+|-- core           <== code relative to the core API
+|   |-- 2.0          <== 2.0 core API code (except .hal, see audio/2.0)
 |   |   |-- default
 |   |   `-- vts
 |   |-- 4.0
-|   |   |-- default  <== default implementation of the device 4.0 api
+|   |   |-- default  <== default implementation of the core 4.0 api
 |   |   `-- vts      <== vts code of the 4.0 API
 |   |-- ...
 |   |   |-- default
 |   |   `-- vts
 |   `-- all_versions
 |       |-- default
-|       `-- vts      <== vts of device API common version independent code
+|       `-- vts      <== vts of core API common version independent code
 |
 `-- effect           <== idem for the effect API
     |-- 2.0

audio/common/README

@@ -1 +1 @@
-This folder contains code common to audio device and effect API
+This folder contains code common to audio core and effect API

audio/core/2.0/default/Android.bp

@@ -35,7 +35,7 @@ cc_library_shared {
 
     header_libs: [
         "android.hardware.audio.common.util@all-versions",
-        "android.hardware.audio@all-versions-impl",
+        "android.hardware.audio.core@all-versions-impl",
         "libaudioclient_headers",
         "libaudio_system_headers",
         "libhardware_headers",

audio/core/2.0/default/Conversions.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/2.0/default/Conversions.h"
+#include "core/2.0/default/Conversions.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Conversions.impl.h>
+#include <core/all-versions/default/Conversions.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/Device.cpp

@@ -16,13 +16,13 @@
 
 #define LOG_TAG "DeviceHAL"
 
-#include "device/2.0/default/Device.h"
+#include "core/2.0/default/Device.h"
 #include <HidlUtils.h>
-#include "device/2.0/default/Conversions.h"
-#include "device/2.0/default/StreamIn.h"
-#include "device/2.0/default/StreamOut.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/Conversions.h"
+#include "core/2.0/default/StreamIn.h"
+#include "core/2.0/default/StreamOut.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Device.impl.h>
+#include <core/all-versions/default/Device.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/DevicesFactory.cpp

@@ -16,10 +16,10 @@
 
 #define LOG_TAG "DevicesFactoryHAL"
 
-#include "device/2.0/default/DevicesFactory.h"
-#include "device/2.0/default/Device.h"
-#include "device/2.0/default/PrimaryDevice.h"
+#include "core/2.0/default/DevicesFactory.h"
+#include "core/2.0/default/Device.h"
+#include "core/2.0/default/PrimaryDevice.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/DevicesFactory.impl.h>
+#include <core/all-versions/default/DevicesFactory.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/ParametersUtil.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/2.0/default/ParametersUtil.h"
+#include "core/2.0/default/ParametersUtil.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/ParametersUtil.impl.h>
+#include <core/all-versions/default/ParametersUtil.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/PrimaryDevice.cpp

@@ -16,9 +16,9 @@
 
 #define LOG_TAG "PrimaryDeviceHAL"
 
-#include "device/2.0/default/PrimaryDevice.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/PrimaryDevice.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/PrimaryDevice.impl.h>
+#include <core/all-versions/default/PrimaryDevice.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/Stream.cpp

@@ -16,10 +16,10 @@
 
 #define LOG_TAG "StreamHAL"
 
-#include "device/2.0/default/Stream.h"
+#include "core/2.0/default/Stream.h"
 #include "common/all-versions/default/EffectMap.h"
-#include "device/2.0/default/Conversions.h"
+#include "core/2.0/default/Conversions.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Stream.impl.h>
+#include <core/all-versions/default/Stream.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/StreamIn.cpp

@@ -16,9 +16,9 @@
 
 #define LOG_TAG "StreamInHAL"
 
-#include "device/2.0/default/StreamIn.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/StreamIn.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamIn.impl.h>
+#include <core/all-versions/default/StreamIn.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/StreamOut.cpp

@@ -16,9 +16,9 @@
 
 #define LOG_TAG "StreamOutHAL"
 
-#include "device/2.0/default/StreamOut.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/StreamOut.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamOut.impl.h>
+#include <core/all-versions/default/StreamOut.impl.h>
 #undef AUDIO_HAL_VERSION

audio/core/2.0/default/include/core/2.0/default/Conversions.h

@@ -20,7 +20,7 @@
 #include <android/hardware/audio/2.0/types.h>
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Conversions.h>
+#include <core/all-versions/default/Conversions.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_CONVERSIONS_H_

audio/core/2.0/default/include/core/2.0/default/Device.h

@@ -22,7 +22,7 @@
 #include "ParametersUtil.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Device.h>
+#include <core/all-versions/default/Device.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H

audio/core/2.0/default/include/core/2.0/default/DevicesFactory.h

@@ -20,7 +20,7 @@
 #include <android/hardware/audio/2.0/IDevicesFactory.h>
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/DevicesFactory.h>
+#include <core/all-versions/default/DevicesFactory.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICESFACTORY_H

audio/core/2.0/default/include/core/2.0/default/ParametersUtil.h

@@ -20,7 +20,7 @@
 #include <android/hardware/audio/2.0/types.h>
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/ParametersUtil.h>
+#include <core/all-versions/default/ParametersUtil.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_PARAMETERS_UTIL_H_

audio/core/2.0/default/include/core/2.0/default/PrimaryDevice.h

@@ -22,7 +22,7 @@
 #include "Device.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/PrimaryDevice.h>
+#include <core/all-versions/default/PrimaryDevice.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H

audio/core/2.0/default/include/core/2.0/default/Stream.h

@@ -22,7 +22,7 @@
 #include "ParametersUtil.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Stream.h>
+#include <core/all-versions/default/Stream.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

audio/core/2.0/default/include/core/2.0/default/StreamIn.h

@@ -23,7 +23,7 @@
 #include "Stream.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamIn.h>
+#include <core/all-versions/default/StreamIn.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAMIN_H

audio/core/2.0/default/include/core/2.0/default/StreamOut.h

@@ -23,7 +23,7 @@
 #include "Stream.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamOut.h>
+#include <core/all-versions/default/StreamOut.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAMOUT_H

audio/core/all-versions/default/Android.bp

@@ -1,5 +1,5 @@
 cc_library_headers {
-    name: "android.hardware.audio@all-versions-impl",
+    name: "android.hardware.audio.core@all-versions-impl",
     relative_install_path: "hw",
     proprietary: true,
     vendor: true,