commit 712dc00b6f00ae0cc9ff138e57c2820d007d4bd5
author Mikhail Naganov <mnaganov@google.com> Thu Jul 23 18:10:20 2020 +0000
committer Mikhail Naganov <mnaganov@google.com> Fri Nov 20 01:30:40 2020 +0000
tree 38e8f78f5c7b3dc8ace1038bfda9b2c9e9846f1f
parent 85486fc425122b2b1984bf323822a7b0933d8158

Add Audio HAL V7

Automatic modifications made by copyHAL.sh script.

Bug: 142480271
Test: m
Change-Id: I6d85fece9360cd5190fa39c35dc5f3659af264c6
Merged-In: I6d85fece9360cd5190fa39c35dc5f3659af264c6

media/libaudiohal/Android.bp

diff --git a/media/libaudiohal/Android.bp b/media/libaudiohal/Android.bp
index 1709d1e..dfa4dc6 100644
--- a/media/libaudiohal/Android.bp
+++ b/media/libaudiohal/Android.bp
@@ -18,6 +18,7 @@
         "libaudiohal@4.0",
         "libaudiohal@5.0",
         "libaudiohal@6.0",
+        "libaudiohal@7.0",
     ],
 
     shared_libs: [

media/libaudiohal/FactoryHalHidl.cpp

diff --git a/media/libaudiohal/FactoryHalHidl.cpp b/media/libaudiohal/FactoryHalHidl.cpp
index 5985ef0..7228b22 100644
--- a/media/libaudiohal/FactoryHalHidl.cpp
+++ b/media/libaudiohal/FactoryHalHidl.cpp
@@ -31,6 +31,7 @@
 /** Supported HAL versions, in order of preference.
  */
 const char* sAudioHALVersions[] = {
+    "7.0",
     "6.0",
     "5.0",
     "4.0",

media/libaudiohal/impl/Android.bp

diff --git a/media/libaudiohal/impl/Android.bp b/media/libaudiohal/impl/Android.bp
index 967fba1..2533d98 100644
--- a/media/libaudiohal/impl/Android.bp
+++ b/media/libaudiohal/impl/Android.bp
@@ -116,3 +116,19 @@
     ]
 }
 
+cc_library_shared {
+    name: "libaudiohal@7.0",
+    defaults: ["libaudiohal_default"],
+    shared_libs: [
+        "android.hardware.audio.common@7.0",
+        "android.hardware.audio.common@7.0-util",
+        "android.hardware.audio.effect@7.0",
+        "android.hardware.audio@7.0",
+    ],
+    cflags: [
+        "-DMAJOR_VERSION=7",
+        "-DMINOR_VERSION=0",
+        "-include common/all-versions/VersionMacro.h",
+    ]
+}
+