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

Commit 3f190e7d authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "Fixes for Linux build" am: 4e52152e 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1687437

Change-Id: I84f7c32bce87dc49aed0f2b65200c2c667192d22
parents 48952e93 4e52152e

system/bta/BUILD.gn

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ static_library("bta") { 
    "sys/bta_sys_conn.cc",

    "sys/bta_sys_main.cc",

    "sys/utl.cc",

    "vc/device.cc",

    "vc/vc.cc",

  ]



  include_dirs = [

system/btif/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static_library("btif") { 
    "src/btif_a2dp_control.cc",

    "src/btif_a2dp_sink.cc",

    "src/btif_a2dp_source.cc",

    "src/btif_activity_attribution.cc",

    "src/btif_av.cc",



    # TODO(abps) - Move this abstraction elsewhere

system/common/metrics_linux.cc

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ void LogA2dpAudioOverrunEvent(const RawAddress& address, 
                              int num_dropped_encoded_frames,

                              int num_dropped_encoded_bytes) {}



void LogA2dpPlaybackEvent(const RawAddress& address, int playback_state,

                          int audio_coding_mode) {}



void LogBluetoothHalCrashReason(const RawAddress& address, uint32_t error_code,

                                uint32_t vendor_error_code) {}



void LogReadRssiResult(const RawAddress& address, uint16_t handle,

                       uint32_t cmd_status, int8_t rssi) {}

system/gd/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static_library("libbluetooth_gd") { 
    "//bt/gd/common:BluetoothCommonSources",

    "//bt/gd/crypto_toolbox:BluetoothCryptoToolboxSources",

    "//bt/gd/dumpsys:BluetoothDumpsysSources",

    "//bt/gd/btaa:BluetoothBtaaSources_linux",

    "//bt/gd/hal:BluetoothHalSources",

    "//bt/gd/hal:BluetoothHalSources_hci_host",

    "//bt/gd/l2cap:BluetoothL2capSources",

system/gd/btaa/BUILD.gn

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#

#  Copyright 2021 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.

#



source_set("BluetoothBtaaSources_linux") {

  sources = [ "linux/activity_attribution.cc" ]



  configs += [ "//bt/gd:gd_defaults" ]

  deps = [ "//bt/gd:gd_default_deps" ]

}