Revert "Audio V4: Split system and vendor Audio.h"
This reverts commit 49c56de516b4e9556ae1b0af0ccfa7d695f5807b.
Reason for revert: Breaks the build of multiple devices
Change-Id: Iebd868467948b8afa5907462ccc0720cd9c4871e
diff --git a/audio/effect/2.0/default/Android.bp b/audio/effect/2.0/default/Android.bp
index d32a9d9..db00988 100644
--- a/audio/effect/2.0/default/Android.bp
+++ b/audio/effect/2.0/default/Android.bp
@@ -41,9 +41,9 @@
header_libs: [
"android.hardware.audio.common.util@all-versions",
"android.hardware.audio.effect@all-versions-impl",
- "android.hardware.audio.common.legacy@2.0",
- "android.hardware.audio.effect.legacy@2.0",
+ "libaudio_system_headers",
"libaudioclient_headers",
+ "libeffects_headers",
"libhardware_headers",
"libmedia_headers",
],
diff --git a/audio/effect/2.0/legacy/Android.bp b/audio/effect/2.0/legacy/Android.bp
deleted file mode 100644
index 68de70e..0000000
--- a/audio/effect/2.0/legacy/Android.bp
+++ /dev/null
@@ -1,12 +0,0 @@
-cc_library_headers {
- name: "android.hardware.audio.effect.legacy@2.0",
- vendor: true,
- header_libs: [
- "android.hardware.audio.common.legacy@2.0",
- "android.hardware.audio.effect.legacy@all-versions",
- ],
- export_header_lib_headers: [
- "android.hardware.audio.common.legacy@2.0",
- "android.hardware.audio.effect.legacy@all-versions",
- ],
-}
diff --git a/audio/effect/2.0/legacy/OWNERS b/audio/effect/2.0/legacy/OWNERS
deleted file mode 100644
index 6fdc97c..0000000
--- a/audio/effect/2.0/legacy/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-elaurent@google.com
-krocard@google.com
-mnaganov@google.com