Merge "Revert "Use headers library for libvibrator""
diff --git a/media/audioserver/Android.bp b/media/audioserver/Android.bp
index ddfd57a..ca3c81c 100644
--- a/media/audioserver/Android.bp
+++ b/media/audioserver/Android.bp
@@ -32,6 +32,7 @@
         "libpowermanager",
         "libutils",
         "libvibrator",
+
     ],
 
     // TODO check if we still need all of these include directories
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index f1bb001..aa740a7 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -112,6 +112,7 @@
         "libprocessgroup",
         "libshmemcompat",
         "libutils",
+        "libvibrator",
     ],
     export_shared_lib_headers: [
         "audioflinger-aidl-unstable-cpp",
diff --git a/media/libaudioprocessing/Android.bp b/media/libaudioprocessing/Android.bp
index ee5b770..39b0ceb 100644
--- a/media/libaudioprocessing/Android.bp
+++ b/media/libaudioprocessing/Android.bp
@@ -53,7 +53,7 @@
     header_libs: [
         "libaudiohal_headers",
         "libbase_headers",
-        "libmedia_headers",
+        "libmedia_headers"
     ],
 
     shared_libs: [