Skip to content
Snippets Groups Projects
Commit c01f3412 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Remove Android a2dp bridge from generic build configuration

Code in audio_a2dp_hw folder contains Android-specific code for talking
to Android media libraries. It is not useful on other platforms, and
only adds unnecessary dependencies.

Test: compile with ninja
Change-Id: Ia0313332b4456ba0287587da66cdf2cce045f89c
parent 5b24bc5d
No related branches found
No related tags found
No related merge requests found
...@@ -81,7 +81,6 @@ Fluoride currently has dependency on some internal Android projects, which also ...@@ -81,7 +81,6 @@ Fluoride currently has dependency on some internal Android projects, which also
cd ~/fluoride cd ~/fluoride
git clone https://android.googlesource.com/platform/system/core git clone https://android.googlesource.com/platform/system/core
git clone https://android.googlesource.com/platform/hardware/libhardware git clone https://android.googlesource.com/platform/hardware/libhardware
git clone https://android.googlesource.com/platform/system/media
``` ```
### Configure your build ### Configure your build
...@@ -102,7 +101,6 @@ This will prompt you to fill the contents of your "out/Default/args.gn" file. Ma ...@@ -102,7 +101,6 @@ This will prompt you to fill the contents of your "out/Default/args.gn" file. Ma
libhw_include_path = "/home/job/fluoride/libhardware/include" libhw_include_path = "/home/job/fluoride/libhardware/include"
core_include_path = "/home/job/fluoride/core/include" core_include_path = "/home/job/fluoride/core/include"
audio_include_path = "/home/job/fluoride/media/audio/include"
``` ```
Then generate your build files by calling Then generate your build files by calling
......
#
# 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.
#
shared_library("audio.a2dp.default") {
sources = [
"audio_a2dp_hw.cc",
"audio_a2dp_hw_utils.cc",
]
include_dirs = [
"include",
"//",
"//utils/include",
]
}
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include <system/audio.h> #include <string.h>
#include "audio_a2dp_hw.h" #include "audio_a2dp_hw.h"
#include "bt_common.h" #include "bt_common.h"
......
...@@ -18,7 +18,6 @@ declare_args() { ...@@ -18,7 +18,6 @@ declare_args() {
# Include path for hardware/bluetooth.h # Include path for hardware/bluetooth.h
libhw_include_path = "" libhw_include_path = ""
core_include_path = "" core_include_path = ""
audio_include_path = ""
} }
config("default_include_dirs") { config("default_include_dirs") {
...@@ -28,12 +27,9 @@ config("default_include_dirs") { ...@@ -28,12 +27,9 @@ config("default_include_dirs") {
"libhardware_include_path build argument wasn't provided.") "libhardware_include_path build argument wasn't provided.")
assert(core_include_path != "", assert(core_include_path != "",
"core_include_path build argument wasn't provided.") "core_include_path build argument wasn't provided.")
assert(audio_include_path != "",
"audio_include_path build argument wasn't provided.")
include_dirs = [ include_dirs = [
libhw_include_path, libhw_include_path,
core_include_path, core_include_path,
audio_include_path,
] ]
} }
......
...@@ -52,13 +52,11 @@ shared_library("bluetooth.default") { ...@@ -52,13 +52,11 @@ shared_library("bluetooth.default") {
"//brcm/include", "//brcm/include",
"//embdrv/sbc/encoder/include", "//embdrv/sbc/encoder/include",
"//embdrv/sbc/decoder/include", "//embdrv/sbc/decoder/include",
"//audio_a2dp_hw",
"//utils/include", "//utils/include",
"//test/suite", "//test/suite",
] ]
deps = [ deps = [
"//audio_a2dp_hw:audio.a2dp.default",
"//bta", "//bta",
"//btcore", "//btcore",
"//btif", "//btif",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment