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

Commit 4d5a986a authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Linux build fix 

am: 02fe77a8

Change-Id: I6f284cdecd4a45dc1c23f218b42d2f472865ef66
parents a458312c 02fe77a8

system/btcore/BUILD.gn

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




static_library("btcore") {

static_library("btcore") {

  sources = [

  sources = [

    "src/bdaddr.cc",

    "src/device_class.cc",

    "src/device_class.cc",

    "src/hal_util.cc",

    "src/hal_util.cc",

    "src/module.cc",

    "src/module.cc",
@@ -52,6 +51,7 @@ executable("net_test_btcore") { 
  deps = [

  deps = [

    "//btcore",

    "//btcore",

    "//osi",

    "//osi",

    "//types",

    "//third_party/googletest:gtest_main",

    "//third_party/googletest:gtest_main",

    "//third_party/libchrome:base",

    "//third_party/libchrome:base",

  ]

  ]

system/btif/src/btif_a2dp_source.cc

+4 −0
Original line number Original line Diff line number Diff line
@@ -21,7 +21,9 @@ 
#define ATRACE_TAG ATRACE_TAG_AUDIO

#define ATRACE_TAG ATRACE_TAG_AUDIO





#include <base/logging.h>

#include <base/logging.h>

#ifndef OS_GENERIC

#include <cutils/trace.h>

#include <cutils/trace.h>

#endif

#include <limits.h>

#include <limits.h>

#include <string.h>

#include <string.h>

#include <algorithm>

#include <algorithm>
@@ -663,7 +665,9 @@ static void btif_a2dp_source_audio_handle_timer(UNUSED_ATTR void* context) { 
    CHECK(btif_a2dp_source_cb.encoder_interface != NULL);

    CHECK(btif_a2dp_source_cb.encoder_interface != NULL);

    size_t transmit_queue_length =

    size_t transmit_queue_length =

        fixed_queue_length(btif_a2dp_source_cb.tx_audio_queue);

        fixed_queue_length(btif_a2dp_source_cb.tx_audio_queue);

#ifndef OS_GENERIC

    ATRACE_INT("btif TX queue", transmit_queue_length);

    ATRACE_INT("btif TX queue", transmit_queue_length);

#endif

    if (btif_a2dp_source_cb.encoder_interface->set_transmit_queue_length !=

    if (btif_a2dp_source_cb.encoder_interface->set_transmit_queue_length !=

        NULL) {

        NULL) {

      btif_a2dp_source_cb.encoder_interface->set_transmit_queue_length(

      btif_a2dp_source_cb.encoder_interface->set_transmit_queue_length(

system/build/BUILD.gn

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
config("default_include_dirs") {

config("default_include_dirs") {

  include_dirs = [

  include_dirs = [

    "//third_party/libhardware/include/",

    "//third_party/libhardware/include/",

    "//types/",

  ]

  ]

}

}

system/service/BUILD.gn

+2 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,8 @@ source_set("service") { 
  ]

  ]





  deps = [

  deps = [

    "//third_party/libchrome:base"

    "//types",

    "//third_party/libchrome:base",

  ]

  ]

}

}

system/stack/BUILD.gn

+4 −1
Original line number Original line Diff line number Diff line
@@ -178,6 +178,7 @@ static_library("stack") { 
  ]

  ]





  deps = [

  deps = [

    "//types",

    "//third_party/libchrome:base",

    "//third_party/libchrome:base",

    "//third_party/libldac:libldacBT_enc",

    "//third_party/libldac:libldacBT_enc",

    "//third_party/libldac:libldacBT_abr",

    "//third_party/libldac:libldacBT_abr",
@@ -225,6 +226,7 @@ executable("stack_unittests") { 
    "//device",

    "//device",

    "//embdrv/sbc",

    "//embdrv/sbc",

    "//hci",

    "//hci",

    "//types",

    "//main:bluetooth.default",

    "//main:bluetooth.default",

    "//third_party/googletest:gmock_main",

    "//third_party/googletest:gmock_main",

    "//third_party/libchrome:base",

    "//third_party/libchrome:base",
@@ -257,6 +259,7 @@ libs = [ 
  ]

  ]





  deps = [

  deps = [

    "//types",

    "//third_party/googletest:gmock_main",

    "//third_party/googletest:gmock_main",

    "//third_party/libchrome:base",

    "//third_party/libchrome:base",

  ]

  ]