From e4f2b615678ccb1fe7e13da4f166c9a45fd16136 Mon Sep 17 00:00:00 2001
From: Pavlin Radoslavov <pavlin@google.com>
Date: Tue, 28 Mar 2017 18:40:32 -0700
Subject: [PATCH] Add missing dependency on the Sony LDAC ABR library
 libldacBT_abr.so

Test: Code compilation
Bug: 35381097
Change-Id: Ib347319942aef4fef6bfd7edc23a4df004fc19fa
---
 build/secondary/third_party/libldac/BUILD.gn | 20 ++++++++++++++++++--
 main/Android.bp                              |  1 +
 stack/BUILD.gn                               |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/build/secondary/third_party/libldac/BUILD.gn b/build/secondary/third_party/libldac/BUILD.gn
index a3b1bf6a6..faf85a280 100644
--- a/build/secondary/third_party/libldac/BUILD.gn
+++ b/build/secondary/third_party/libldac/BUILD.gn
@@ -14,17 +14,33 @@
 #  limitations under the License.
 #
 
-config("libldacBT_config") {
+config("libldacBT_enc_config") {
   include_dirs = [ "inc" ]
 }
 
+config("libldacBT_abr_config") {
+  include_dirs = [ "abr/inc", "inc" ]
+}
+
 shared_library("libldacBT_enc") {
   sources = [
     "src/ldaclib.c",
     "src/ldacBT.c",
   ]
 
-  public_configs = [ ":libldacBT_config" ]
+  public_configs = [ ":libldacBT_enc_config" ]
+
+  cflags = [ "-O2" ]
+
+  defines = [ "EXPORT_SYMBOL=" ]
+}
+
+shared_library("libldacBT_abr") {
+  sources = [
+    "abr/src/ldacBT_abr.c",
+  ]
+
+  public_configs = [ ":libldacBT_abr_config" ]
 
   cflags = [ "-O2" ]
 
diff --git a/main/Android.bp b/main/Android.bp
index 37f98c110..760c3ac0e 100644
--- a/main/Android.bp
+++ b/main/Android.bp
@@ -79,6 +79,7 @@ cc_library_shared {
         "libbt-hci",
         "libbt-vendor",
         "libldacBT_enc",
+        "libldacBT_abr",
     ],
     cflags: [
         "-DBUILDCFG",
diff --git a/stack/BUILD.gn b/stack/BUILD.gn
index 2e4bb1881..0c8547be5 100644
--- a/stack/BUILD.gn
+++ b/stack/BUILD.gn
@@ -181,6 +181,7 @@ static_library("stack") {
   deps = [
     "//third_party/libchrome:base",
     "//third_party/libldac:libldacBT_enc",
+    "//third_party/libldac:libldacBT_abr",
     "//third_party/aac:libFraunhoferAAC",
   ]
 }
-- 
2.11.0