summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/README18
-rw-r--r--audio/common/README2
-rw-r--r--audio/core/2.0/default/Android.bp (renamed from audio/device/2.0/default/Android.bp)2
-rw-r--r--audio/core/2.0/default/Conversions.cpp (renamed from audio/device/2.0/default/Conversions.cpp)4
-rw-r--r--audio/core/2.0/default/Device.cpp (renamed from audio/device/2.0/default/Device.cpp)12
-rw-r--r--audio/core/2.0/default/DevicesFactory.cpp (renamed from audio/device/2.0/default/DevicesFactory.cpp)8
-rw-r--r--audio/core/2.0/default/OWNERS (renamed from audio/device/2.0/default/OWNERS)0
-rw-r--r--audio/core/2.0/default/ParametersUtil.cpp (renamed from audio/device/2.0/default/ParametersUtil.cpp)4
-rw-r--r--audio/core/2.0/default/PrimaryDevice.cpp (renamed from audio/device/2.0/default/PrimaryDevice.cpp)6
-rw-r--r--audio/core/2.0/default/Stream.cpp (renamed from audio/device/2.0/default/Stream.cpp)6
-rw-r--r--audio/core/2.0/default/StreamIn.cpp (renamed from audio/device/2.0/default/StreamIn.cpp)6
-rw-r--r--audio/core/2.0/default/StreamOut.cpp (renamed from audio/device/2.0/default/StreamOut.cpp)6
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/Conversions.h (renamed from audio/device/2.0/default/include/device/2.0/default/Conversions.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/Device.h (renamed from audio/device/2.0/default/include/device/2.0/default/Device.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/DevicesFactory.h (renamed from audio/device/2.0/default/include/device/2.0/default/DevicesFactory.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/ParametersUtil.h (renamed from audio/device/2.0/default/include/device/2.0/default/ParametersUtil.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/PrimaryDevice.h (renamed from audio/device/2.0/default/include/device/2.0/default/PrimaryDevice.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/Stream.h (renamed from audio/device/2.0/default/include/device/2.0/default/Stream.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/StreamIn.h (renamed from audio/device/2.0/default/include/device/2.0/default/StreamIn.h)2
-rw-r--r--audio/core/2.0/default/include/core/2.0/default/StreamOut.h (renamed from audio/device/2.0/default/include/device/2.0/default/StreamOut.h)2
-rw-r--r--audio/core/all-versions/OWNERS (renamed from audio/device/all-versions/OWNERS)0
-rw-r--r--audio/core/all-versions/default/Android.bp (renamed from audio/device/all-versions/default/Android.bp)2
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Conversions.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Conversions.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Conversions.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Device.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Device.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Device.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Device.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Stream.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Stream.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Stream.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Stream.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/StreamIn.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/StreamIn.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/StreamIn.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/StreamIn.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/StreamOut.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/StreamOut.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/StreamOut.impl.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/StreamOut.impl.h)0
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Util.h (renamed from audio/device/all-versions/default/include/device/all-versions/default/Util.h)0
39 files changed, 46 insertions, 46 deletions
diff --git a/audio/README b/audio/README
index b40bad094..2b814506b 100644
--- a/audio/README
+++ b/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
diff --git a/audio/common/README b/audio/common/README
index 88cea46da..cd03106ac 100644
--- a/audio/common/README
+++ b/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
diff --git a/audio/device/2.0/default/Android.bp b/audio/core/2.0/default/Android.bp
index d0c466b59..98478860c 100644
--- a/audio/device/2.0/default/Android.bp
+++ b/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",
diff --git a/audio/device/2.0/default/Conversions.cpp b/audio/core/2.0/default/Conversions.cpp
index db5d8d07d..6c3209062 100644
--- a/audio/device/2.0/default/Conversions.cpp
+++ b/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
diff --git a/audio/device/2.0/default/Device.cpp b/audio/core/2.0/default/Device.cpp
index d5bbae89f..221ea5c0e 100644
--- a/audio/device/2.0/default/Device.cpp
+++ b/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
diff --git a/audio/device/2.0/default/DevicesFactory.cpp b/audio/core/2.0/default/DevicesFactory.cpp
index 473240420..65a9ccdc4 100644
--- a/audio/device/2.0/default/DevicesFactory.cpp
+++ b/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
diff --git a/audio/device/2.0/default/OWNERS b/audio/core/2.0/default/OWNERS
index 6fdc97ca2..6fdc97ca2 100644
--- a/audio/device/2.0/default/OWNERS
+++ b/audio/core/2.0/default/OWNERS
diff --git a/audio/device/2.0/default/ParametersUtil.cpp b/audio/core/2.0/default/ParametersUtil.cpp
index 8fabf5f47..33a3ad9b7 100644
--- a/audio/device/2.0/default/ParametersUtil.cpp
+++ b/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
diff --git a/audio/device/2.0/default/PrimaryDevice.cpp b/audio/core/2.0/default/PrimaryDevice.cpp
index 1f6e7b544..ce5740386 100644
--- a/audio/device/2.0/default/PrimaryDevice.cpp
+++ b/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
diff --git a/audio/device/2.0/default/Stream.cpp b/audio/core/2.0/default/Stream.cpp
index bdc6146b5..69ee65981 100644
--- a/audio/device/2.0/default/Stream.cpp
+++ b/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
diff --git a/audio/device/2.0/default/StreamIn.cpp b/audio/core/2.0/default/StreamIn.cpp
index f97f6b328..6b8776ebe 100644
--- a/audio/device/2.0/default/StreamIn.cpp
+++ b/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
diff --git a/audio/device/2.0/default/StreamOut.cpp b/audio/core/2.0/default/StreamOut.cpp
index 152c4d203..7f1461ac7 100644
--- a/audio/device/2.0/default/StreamOut.cpp
+++ b/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
diff --git a/audio/device/2.0/default/include/device/2.0/default/Conversions.h b/audio/core/2.0/default/include/core/2.0/default/Conversions.h
index 457936170..b3a6ea886 100644
--- a/audio/device/2.0/default/include/device/2.0/default/Conversions.h
+++ b/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_
diff --git a/audio/device/2.0/default/include/device/2.0/default/Device.h b/audio/core/2.0/default/include/core/2.0/default/Device.h
index d28f6ba22..3ec74649e 100644
--- a/audio/device/2.0/default/include/device/2.0/default/Device.h
+++ b/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
diff --git a/audio/device/2.0/default/include/device/2.0/default/DevicesFactory.h b/audio/core/2.0/default/include/core/2.0/default/DevicesFactory.h
index 919154ae1..8e8ee88ff 100644
--- a/audio/device/2.0/default/include/device/2.0/default/DevicesFactory.h
+++ b/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
diff --git a/audio/device/2.0/default/include/device/2.0/default/ParametersUtil.h b/audio/core/2.0/default/include/core/2.0/default/ParametersUtil.h
index 7d4c46f08..a5c1c78f9 100644
--- a/audio/device/2.0/default/include/device/2.0/default/ParametersUtil.h
+++ b/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_
diff --git a/audio/device/2.0/default/include/device/2.0/default/PrimaryDevice.h b/audio/core/2.0/default/include/core/2.0/default/PrimaryDevice.h
index e1fb4fe6c..f89859700 100644
--- a/audio/device/2.0/default/include/device/2.0/default/PrimaryDevice.h
+++ b/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
diff --git a/audio/device/2.0/default/include/device/2.0/default/Stream.h b/audio/core/2.0/default/include/core/2.0/default/Stream.h
index d05911753..a2d845609 100644
--- a/audio/device/2.0/default/include/device/2.0/default/Stream.h
+++ b/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
diff --git a/audio/device/2.0/default/include/device/2.0/default/StreamIn.h b/audio/core/2.0/default/include/core/2.0/default/StreamIn.h
index 28481f951..c36abbd68 100644
--- a/audio/device/2.0/default/include/device/2.0/default/StreamIn.h
+++ b/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
diff --git a/audio/device/2.0/default/include/device/2.0/default/StreamOut.h b/audio/core/2.0/default/include/core/2.0/default/StreamOut.h
index 7ab717857..ab3568741 100644
--- a/audio/device/2.0/default/include/device/2.0/default/StreamOut.h
+++ b/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
diff --git a/audio/device/all-versions/OWNERS b/audio/core/all-versions/OWNERS
index 6fdc97ca2..6fdc97ca2 100644
--- a/audio/device/all-versions/OWNERS
+++ b/audio/core/all-versions/OWNERS
diff --git a/audio/device/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp
index 302935956..214b8d5b2 100644
--- a/audio/device/all-versions/default/Android.bp
+++ b/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,
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Conversions.h b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.h
index fa053509f..fa053509f 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Conversions.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Conversions.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
index 3f3f936a4..3f3f936a4 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Conversions.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Device.h b/audio/core/all-versions/default/include/core/all-versions/default/Device.h
index 224823c8a..224823c8a 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Device.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Device.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Device.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Device.impl.h
index b2950825b..b2950825b 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Device.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Device.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.h b/audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.h
index 769adaa1e..769adaa1e 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.impl.h
index 014b4d804..014b4d804 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.h b/audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.h
index df5adeefc..df5adeefc 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.impl.h
index a858a488e..a858a488e 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.h b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.h
index 240b2212a..240b2212a 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
index 3ce047ac0..3ce047ac0 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Stream.h b/audio/core/all-versions/default/include/core/all-versions/default/Stream.h
index 4196dec7d..4196dec7d 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Stream.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Stream.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Stream.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Stream.impl.h
index 92cff7264..92cff7264 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Stream.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Stream.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamIn.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamIn.h
index 7380dae10..7380dae10 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/StreamIn.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/StreamIn.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamIn.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamIn.impl.h
index abee225dc..abee225dc 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/StreamIn.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/StreamIn.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamOut.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamOut.h
index 4cfe2e33f..4cfe2e33f 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/StreamOut.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/StreamOut.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamOut.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamOut.impl.h
index bdbeb3828..bdbeb3828 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/StreamOut.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/StreamOut.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Util.h b/audio/core/all-versions/default/include/core/all-versions/default/Util.h
index 39d9dbde0..39d9dbde0 100644
--- a/audio/device/all-versions/default/include/device/all-versions/default/Util.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Util.h