commit 07be14fb96fc5c106ea2b874faf2b768f468eb8e
author Kevin Rocard <krocard@google.com> Wed Jan 24 06:14:03 2018 +0000
committer Kevin Rocard <krocard@google.com> Wed Jan 24 06:14:03 2018 +0000
tree 01cd8f75542d7581505bef8a5b9e2f09790ac0e1
parent f8ad7f85e9891b2614338330c75ae9e946fccc5a

Revert "Audio V4: Split system and vendor Audio.h"

This reverts commit f8ad7f85e9891b2614338330c75ae9e946fccc5a.

Reason for revert: Breaks the build of multiple devices

Change-Id: I24f17a0fa0c7ba171c4a3639f890e7f4e42f6b1e

media/libeffects/factory/Android.bp

diff --git a/media/libeffects/factory/Android.bp b/media/libeffects/factory/Android.bp
index fded0b7..ddbfdd8 100644
--- a/media/libeffects/factory/Android.bp
+++ b/media/libeffects/factory/Android.bp
@@ -1,3 +1,11 @@
+cc_library_headers {
+    name: "libeffects_headers",
+    vendor_available: true,
+    export_include_dirs: ["include"],
+    header_libs: ["libhardware_headers"],
+    export_header_lib_headers: ["libhardware_headers"],
+}
+
 // Effect factory library
 cc_library_shared {
     name: "libeffects",
@@ -13,20 +21,21 @@
         "libcutils",
         "liblog",
         "libdl",
-        "libeffectsconfig@2.0",
+        "libeffectsconfig",
     ],
     cflags: ["-fvisibility=hidden"],
 
-    export_include_dirs: ["."],
+    local_include_dirs:["include/media"],
 
     header_libs: [
-        "android.hardware.audio.effect.legacy@2.0",
+        "libaudioeffects",
+        "libeffects_headers",
     ],
-    export_header_lib_headers: ["android.hardware.audio.effect.legacy@2.0"],
+    export_header_lib_headers: ["libeffects_headers"],
 }
 
 cc_binary {
-    name: "dumpEffectConfigFile@2.0",
+    name: "dumpEffectConfigFile",
     vendor: true,
     srcs: ["test/DumpConfig.cpp"],
 
@@ -38,12 +47,10 @@
         "-Werror",
     ],
 
-    header_libs: [
-        "android.hardware.audio.effect.legacy@2.0",
-    ],
 
     shared_libs: [
-        "libeffectsconfig@2.0",
+        "libeffectsconfig",
         "libeffects",
     ],
+    local_include_dirs:[".", "include"],
 }