Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

README.md

+0 −2
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ Fluoride currently has dependency on some internal Android projects, which also 
cd ~/fluoride

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/system/media

```



### Configure your build
@@ -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"

core_include_path = "/home/job/fluoride/core/include"

audio_include_path = "/home/job/fluoride/media/audio/include"

```



Then generate your build files by calling

system/audio_a2dp_hw/BUILD.gn

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#

#  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",

  ]

}

system/btif/src/btif_a2dp_source.cc

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <assert.h>

#include <limits.h>

#include <system/audio.h>

#include <string.h>



#include "audio_a2dp_hw.h"

#include "bt_common.h"

system/build/BUILD.gn

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ declare_args() { 
  # Include path for hardware/bluetooth.h

  libhw_include_path = ""

  core_include_path = ""

  audio_include_path = ""

}



config("default_include_dirs") {
@@ -28,12 +27,9 @@ config("default_include_dirs") { 
         "libhardware_include_path build argument wasn't provided.")

  assert(core_include_path != "",

         "core_include_path build argument wasn't provided.")

  assert(audio_include_path != "",

         "audio_include_path build argument wasn't provided.")

  include_dirs = [

    libhw_include_path,

    core_include_path,

    audio_include_path,

  ]

}

system/main/BUILD.gn

+0 −2
Original line number Diff line number Diff line
@@ -52,13 +52,11 @@ shared_library("bluetooth.default") { 
    "//brcm/include",

    "//embdrv/sbc/encoder/include",

    "//embdrv/sbc/decoder/include",

    "//audio_a2dp_hw",

    "//utils/include",

    "//test/suite",

  ]



  deps = [

    "//audio_a2dp_hw:audio.a2dp.default",

    "//bta",

    "//btcore",

    "//btif",