Linux build fix

Test: manual
Change-Id: I5c86e96b9bb1cee5b535ea1fa6ba0b6d078a9b09
(cherry picked from commit 17f449dab52a6092422a0405e6fe589488661594)

diff --git a/BUILD.gn b/BUILD.gn
index ffbe4ef..3cb29e1 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -25,7 +25,6 @@ group("bluetooth") {
   deps = [
     "//main:bluetooth.default",
     "//service:bluetoothtbd",
-    "//vendor_libs:vendor-libs",
   ]
 }
 

diff --git a/btif/BUILD.gn b/btif/BUILD.gn
index 8bbdbbf..3b58933 100644 (file)
--- a/btif/BUILD.gn
+++ b/btif/BUILD.gn
@@ -78,6 +78,7 @@ static_library("btif") {
   include_dirs = [
     "include",
     "//",
+    "//audio_a2dp_hw/include",
     "//bta/include",
     "//bta/sys",
     "//btcore/include",

diff --git a/stack/BUILD.gn b/stack/BUILD.gn
index 9e0dc37..87535d4 100644 (file)
--- a/stack/BUILD.gn
+++ b/stack/BUILD.gn
@@ -29,6 +29,7 @@ static_library("stack") {
     "a2dp/a2dp_vendor_aptx_hd.cc",
     "a2dp/a2dp_vendor_aptx_hd_encoder.cc",
     "a2dp/a2dp_vendor_ldac.cc",
+    "a2dp/a2dp_vendor_ldac_abr.cc",
     "a2dp/a2dp_vendor_ldac_encoder.cc",
     "avct/avct_api.cc",
     "avct/avct_bcb_act.cc",

diff --git a/vendor_libs/BUILD.gn b/vendor_libs/BUILD.gn
deleted file mode 100644 (file)
index 30e2086..0000000
--- a/vendor_libs/BUILD.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  Copyright (C) 2015 Google, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at:
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-
-group("vendor-libs") {
-  deps = [
-    "test_vendor_lib:test_vendor_lib",
-  ]
-}