commit 0e586f44446043d570281efa0821410352745d9c
author Kevin Rocard <krocard@google.com> Wed Jan 24 06:09:44 2018 +0000
committer Kevin Rocard <krocard@google.com> Wed Jan 24 06:09:44 2018 +0000
tree d9d82a4f4c8af0b84534fe21d9a7cbd2356d5c3e
parent 6f04dc59644eaaf8e38fbc5c57578d3216db3adb

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

This reverts commit 6f04dc59644eaaf8e38fbc5c57578d3216db3adb.

Reason for revert: Breaks multiple devices

Change-Id: I7d447b196b71f72918d94716ba5f16e0ad21db06

audio_utils/tests/Android.bp

diff --git a/audio_utils/tests/Android.bp b/audio_utils/tests/Android.bp
index 40877b8..8eec07c 100644
--- a/audio_utils/tests/Android.bp
+++ b/audio_utils/tests/Android.bp
@@ -15,10 +15,10 @@
     ],
     target: {
         android: {
-            shared_libs: ["libaudioutils_system"],
+            shared_libs: ["libaudioutils"],
         },
         host: {
-            static_libs: ["libaudioutils_system"],
+            static_libs: ["libaudioutils"],
         },
     }
 }
@@ -39,7 +39,7 @@
     ],
     static_libs: [
         "libgoogle-benchmark",
-        "libaudioutils_system",
+        "libaudioutils",
     ],
 }
 
@@ -47,7 +47,7 @@
     name: "fifo_tests",
     host_supported: true,
     srcs: ["fifo_tests.cpp"],
-    shared_libs: ["libaudioutils_system"],
+    shared_libs: ["libaudioutils"],
     static_libs: ["libsndfile"],
     cflags: [
         "-Werror",
@@ -59,7 +59,7 @@
     name: "fifo_multiprocess",
     host_supported: false,
     srcs: ["fifo_multiprocess.cpp"],
-    shared_libs: ["libaudioutils_system", "libcutils"],
+    shared_libs: ["libaudioutils", "libcutils"],
     static_libs: ["libsndfile"],
     cflags: [
         "-Werror",
@@ -75,7 +75,7 @@
         "getch.c",
     ],
     static_libs: [
-        "libaudioutils_system",
+        "libaudioutils",
         "liblog",
     ],
     cflags: [
@@ -87,7 +87,7 @@
 cc_binary_host {
     name: "limiter_tests",
     srcs: ["limiter_tests.c"],
-    static_libs: ["libaudioutils_system"],
+    static_libs: ["libaudioutils"],
     cflags: [
         "-Werror",
         "-Wall",
@@ -111,10 +111,10 @@
     ],
     target: {
         android: {
-            shared_libs: ["libaudioutils_system"],
+            shared_libs: ["libaudioutils"],
         },
         host: {
-            static_libs: ["libaudioutils_system"],
+            static_libs: ["libaudioutils"],
         },
     }
 }
@@ -135,10 +135,10 @@
     ],
     target: {
         android: {
-            shared_libs: ["libaudioutils_system"],
+            shared_libs: ["libaudioutils"],
         },
         host: {
-            static_libs: ["libaudioutils_system"],
+            static_libs: ["libaudioutils"],
         },
     }
 }
@@ -159,10 +159,10 @@
     ],
     target: {
         android: {
-            shared_libs: ["libaudioutils_system"],
+            shared_libs: ["libaudioutils"],
         },
         host: {
-            static_libs: ["libaudioutils_system"],
+            static_libs: ["libaudioutils"],
         },
     }
 }
@@ -183,10 +183,10 @@
     ],
     target: {
         android: {
-            shared_libs: ["libaudioutils_system"],
+            shared_libs: ["libaudioutils"],
         },
         host: {
-            static_libs: ["libaudioutils_system"],
+            static_libs: ["libaudioutils"],
         },
     }
 }
@@ -206,10 +206,10 @@
     ],
     target: {
         android: {
-            shared_libs: ["libaudioutils_system"],
+            shared_libs: ["libaudioutils"],
         },
         host: {
-            static_libs: ["libaudioutils_system"],
+            static_libs: ["libaudioutils"],
         },
     }
 }