Rearrange soundtrigger3 directory structure

Test: m
Change-Id: I35f041769c3835fa6d63bcb0d4bffac3c8a1aa46

11 files changed, 3 insertions, 4 deletions

diff --git a/soundtrigger/3/Android.bp b/soundtrigger/aidl/Android.bp
index e56c5ad311..6c084da740 100644
--- a/soundtrigger/3/Android.bp
+++ b/soundtrigger/aidl/Android.bp
@@ -1,12 +1,11 @@
 aidl_interface {
     name: "android.hardware.soundtrigger3",
     vendor_available: true,
-    local_include_dir: "aidl",
     flags: ["-Werror", "-Weverything", ],
     srcs: [
-        "aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl",
-        "aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl",
-        "aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl",
+        "android/hardware/soundtrigger3/ISoundTriggerHw.aidl",
+        "android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl",
+        "android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl",
     ],
     stability: "vintf",
     imports: [
diff --git a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
index bbfe7d9161..bbfe7d9161 100644
--- a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
+++ b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
diff --git a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
index 152dfed637..152dfed637 100644
--- a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
+++ b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
diff --git a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
index 6dfee9fa2f..6dfee9fa2f 100644
--- a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
+++ b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
diff --git a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
index 2a3fc644ee..2a3fc644ee 100644
--- a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
+++ b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
diff --git a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
index 049ca6574a..049ca6574a 100644
--- a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
+++ b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
diff --git a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
index d6d86308ba..d6d86308ba 100644
--- a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
+++ b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
diff --git a/soundtrigger/3/cli/Android.bp b/soundtrigger/aidl/cli/Android.bp
index 880903a4c2..880903a4c2 100644
--- a/soundtrigger/3/cli/Android.bp
+++ b/soundtrigger/aidl/cli/Android.bp
diff --git a/soundtrigger/3/cli/OWNERS b/soundtrigger/aidl/cli/OWNERS
index e21b66ecb3..e21b66ecb3 100644
--- a/soundtrigger/3/cli/OWNERS
+++ b/soundtrigger/aidl/cli/OWNERS
diff --git a/soundtrigger/3/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
index d3e1aa7eaa..d3e1aa7eaa 100644
--- a/soundtrigger/3/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
+++ b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
diff --git a/soundtrigger/3/cli/sthal_cli_3 b/soundtrigger/aidl/cli/sthal_cli_3
index f157c50276..f157c50276 100644
--- a/soundtrigger/3/cli/sthal_cli_3
+++ b/soundtrigger/aidl/cli/sthal_cli_3