Audio V4: Move common files before refactor
This will make diff much more clear and allow git to follow the files.
Bug: 38184704
Test: compile
Change-Id: I41ccb41c334aa56d3935be333e6227dd99773766
Signed-off-by: Kevin Rocard <krocard@google.com>
diff --git a/audio/README b/audio/README
new file mode 100644
index 0000000..b40bad0
--- /dev/null
+++ b/audio/README
@@ -0,0 +1,47 @@
+Directory structure of the audio HIDL related code.
+
+audio
+|-- 2.0 <== legacy 2.0 device HIDL (.hal) can not be moved to fit
+| the directory structure because already published
+|
+|-- common <== code common to audio device and effect API
+| |-- 2.0
+| | |-- default <== code that wraps the legacy API
+| | `-- vts <== vts of 2.0 device 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
+| |-- default
+| `-- vts <== vts of device 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)
+| | |-- default
+| | `-- vts
+| |-- 4.0
+| | |-- default <== default implementation of the device 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
+|
+`-- effect <== idem for the effect API
+ |-- 2.0
+ | |-- default
+ | `-- vts
+ |-- 4.0
+ | |-- default
+ | `-- vts
+ |-- ...
+ | |-- default
+ | `-- vts
+ `-- all_versions
+ |-- default
+ `-- vts
diff --git a/audio/common/README b/audio/common/README
new file mode 100644
index 0000000..88cea46
--- /dev/null
+++ b/audio/common/README
@@ -0,0 +1 @@
+This folder contains code common to audio device and effect API
diff --git a/audio/common/all-versions/README b/audio/common/all-versions/README
new file mode 100644
index 0000000..d8df022
--- /dev/null
+++ b/audio/common/all-versions/README
@@ -0,0 +1 @@
+This folder contains code common to all versions of the audio API
diff --git a/audio/common/2.0/default/Android.bp b/audio/common/all-versions/default/Android.bp
similarity index 100%
rename from audio/common/2.0/default/Android.bp
rename to audio/common/all-versions/default/Android.bp
diff --git a/audio/common/2.0/default/EffectMap.cpp b/audio/common/all-versions/default/EffectMap.cpp
similarity index 100%
rename from audio/common/2.0/default/EffectMap.cpp
rename to audio/common/all-versions/default/EffectMap.cpp
diff --git a/audio/common/2.0/default/EffectMap.h b/audio/common/all-versions/default/EffectMap.h
similarity index 100%
rename from audio/common/2.0/default/EffectMap.h
rename to audio/common/all-versions/default/EffectMap.h
diff --git a/audio/common/2.0/default/HidlUtils.cpp b/audio/common/all-versions/default/HidlUtils.cpp
similarity index 100%
rename from audio/common/2.0/default/HidlUtils.cpp
rename to audio/common/all-versions/default/HidlUtils.cpp
diff --git a/audio/common/2.0/default/HidlUtils.h b/audio/common/all-versions/default/HidlUtils.h
similarity index 100%
rename from audio/common/2.0/default/HidlUtils.h
rename to audio/common/all-versions/default/HidlUtils.h
diff --git a/audio/common/2.0/default/OWNERS b/audio/common/all-versions/default/OWNERS
similarity index 100%
rename from audio/common/2.0/default/OWNERS
rename to audio/common/all-versions/default/OWNERS