commit df9b420d1a43d4fa7d75e10f00a15e482c994cae
author Kevin Rocard <krocard@google.com> Thu May 10 19:56:08 2018 -0700
committer Kevin Rocard <krocard@google.com> Mon Jun 18 12:58:10 2018 -0700
tree c7367730f593d5904396f5ef2bb04010d97090ca
parent d308499867c5403eb68113c793727183f82a48cf

Align LibAudioHal V2 and V4 for factorisation

In order to merge the two version, they must first align as much
as possible.

Test: playback music, assistant
Change-Id: If517cc3f4646a224af3e9b3d42b68a75f1801b39
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/2.0/Android.bp

diff --git a/media/libaudiohal/2.0/Android.bp b/media/libaudiohal/2.0/Android.bp
index 574b435..29a32af 100644
--- a/media/libaudiohal/2.0/Android.bp
+++ b/media/libaudiohal/2.0/Android.bp
@@ -1,5 +1,5 @@
-cc_library_shared {
-    name: "libaudiohal@2.0",
+cc_defaults {
+    name: "libaudiohal@2.0_default",
 
     srcs: [
         "DeviceHalLocal.cpp",
@@ -16,15 +16,17 @@
         "StreamHalHidl.cpp",
     ],
 
-    export_include_dirs: ["."],
+    export_include_dirs: ["include"],
 
     cflags: [
         "-Wall",
+        "-Wextra",
         "-Werror",
     ],
     shared_libs: [
         "libaudiohal_deathhandler",
         "libaudioutils",
+        "libbinder",
         "libcutils",
         "liblog",
         "libutils",
@@ -35,16 +37,14 @@
         "libhidlbase",
         "libhidlmemory",
         "libhidltransport",
-        "android.hardware.audio@2.0",
-        "android.hardware.audio.common@2.0",
-        "android.hardware.audio.common@2.0-util",
-        "android.hardware.audio.effect@2.0",
+        "android.hardware.audio.common-util",
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
         "libmedia_helper",
         "libmediautils",
     ],
     header_libs: [
+        "android.hardware.audio.common.util@all-versions",
         "libaudiohal_headers"
     ],
 
@@ -52,3 +52,14 @@
         "libfmq",
     ],
 }
+
+cc_library_shared {
+    name: "libaudiohal@2.0",
+    defaults: ["libaudiohal@2.0_default"],
+    shared_libs: [
+        "android.hardware.audio@2.0",
+        "android.hardware.audio.common@2.0",
+        "android.hardware.audio.common@2.0-util",
+        "android.hardware.audio.effect@2.0",
+    ],
+}