From 8829f2f17db6ec82570ada922d53f6b2994f11c5 Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Mon, 10 Apr 2017 02:19:29 -0700
Subject: [PATCH] Linux build fix
Test: manual
Change-Id: I5c86e96b9bb1cee5b535ea1fa6ba0b6d078a9b09
---
BUILD.gn | 1 -
system/btif/BUILD.gn | 1 +
system/stack/BUILD.gn | 1 +
system/vendor_libs/BUILD.gn | 21 ---------------------
4 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 system/vendor_libs/BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index ffbe4ef4269..3cb29e1a1ce 100644
--- 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/system/btif/BUILD.gn b/system/btif/BUILD.gn
index 8bbdbbf857f..3b589334c8f 100644
--- a/system/btif/BUILD.gn
+++ b/system/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/system/stack/BUILD.gn b/system/stack/BUILD.gn
index 9e0dc378c14..87535d42b97 100644
--- a/system/stack/BUILD.gn
+++ b/system/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/system/vendor_libs/BUILD.gn b/system/vendor_libs/BUILD.gn
deleted file mode 100644
index 30e2086e8df..00000000000
--- a/system/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",
- ]
-}
--
GitLab