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/config/Android.bp

diff --git a/media/libeffects/config/Android.bp b/media/libeffects/config/Android.bp
index 4a1653a..3e88c7c 100644
--- a/media/libeffects/config/Android.bp
+++ b/media/libeffects/config/Android.bp
@@ -1,6 +1,7 @@
 // Effect configuration
 cc_library_shared {
     name: "libeffectsconfig",
+    vendor_available: true,
 
     srcs: ["src/EffectsConfig.cpp"],
 
@@ -19,29 +20,3 @@
 
     export_include_dirs: ["include"],
 }
-
-cc_library_shared {
-    name: "libeffectsconfig@2.0",
-    vendor: true,
-
-    srcs: ["src/EffectsConfig.cpp"],
-
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-
-    shared_libs: [
-        "liblog",
-        "libtinyxml2",
-    ],
-
-    export_include_dirs: ["include"],
-
-    header_libs: [
-        "android.hardware.audio.common.legacy@2.0",
-    ],
-    export_header_lib_headers: [
-        "android.hardware.audio.common.legacy@2.0",
-    ],
-}