commit 0d6a9e87c7e7b981af64c2a5a5267bb48d0d3fba
author Mikhail Naganov <mnaganov@google.com> Tue Feb 02 00:07:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 02 00:07:42 2021 +0000
tree 013aab3a136dc68ed48cf2a2fa18a95b9baaae31
parent 34cee6315f602dbfabcb66c92efc00be5889208d
parent 1c9c1e58f25350e24e8918b20095e7d8bf8ad681

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16d0e8866335be43c8d7ece54c037050ec8b9869

media/libaudiohal/Android.bp

diff --git a/media/libaudiohal/Android.bp b/media/libaudiohal/Android.bp
index d9a7804..28549d0 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 fe47881..0276e4b 100644
--- a/media/libaudiohal/impl/Android.bp
+++ b/media/libaudiohal/impl/Android.bp
@@ -54,22 +54,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: [