commit 1c9c1e58f25350e24e8918b20095e7d8bf8ad681
author Mikhail Naganov <mnaganov@google.com> Mon Feb 01 22:57:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 01 22:57:54 2021 +0000
tree f3147080c51df059ddcadfe6b3c65174e9056abb
parent 30321b848cb2789d6d6dfb0937f16f0112572f33
parent 215679991106051c32aad7eaed20d9df878a34be

Merge "Remove support for audio HAL V2 from the framework" am: 56593f4ef4 am: 2156799911

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1564336

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5c0bcc3b8348ce59569cbd0378c00c670f0ea9d

media/libaudiohal/Android.bp

diff --git a/media/libaudiohal/Android.bp b/media/libaudiohal/Android.bp
index fab0fea..9a6272b 100644
--- a/media/libaudiohal/Android.bp
+++ b/media/libaudiohal/Android.bp
@@ -14,7 +14,6 @@
     ],
 
     required: [
-        "libaudiohal@2.0",
         "libaudiohal@4.0",
         "libaudiohal@5.0",
         "libaudiohal@6.0",

media/libaudiohal/FactoryHalHidl.cpp

diff --git a/media/libaudiohal/FactoryHalHidl.cpp b/media/libaudiohal/FactoryHalHidl.cpp
index 7228b22..e420d07 100644
--- a/media/libaudiohal/FactoryHalHidl.cpp
+++ b/media/libaudiohal/FactoryHalHidl.cpp
@@ -35,7 +35,6 @@
     "6.0",
     "5.0",
     "4.0",
-    "2.0",
     nullptr
 };
 

media/libaudiohal/impl/Android.bp

diff --git a/media/libaudiohal/impl/Android.bp b/media/libaudiohal/impl/Android.bp
index df006b5..7b116bd 100644
--- a/media/libaudiohal/impl/Android.bp
+++ b/media/libaudiohal/impl/Android.bp
@@ -53,22 +53,6 @@
 }
 
 cc_library_shared {
-    name: "libaudiohal@2.0",
-    defaults: ["libaudiohal_default"],
-    shared_libs: [
-        "android.hardware.audio.common@2.0",
-        "android.hardware.audio.common@2.0-util",
-        "android.hardware.audio.effect@2.0",
-        "android.hardware.audio@2.0",
-    ],
-    cflags: [
-        "-DMAJOR_VERSION=2",
-        "-DMINOR_VERSION=0",
-        "-include common/all-versions/VersionMacro.h",
-    ]
-}
-
-cc_library_shared {
     name: "libaudiohal@4.0",
     defaults: ["libaudiohal_default"],
     shared_libs: [