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

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

Linux build fix 

am: de5ab0a6

Change-Id: Id8a1d0a02c60f86d7232394ad60af56b96a05b4e
parents 0c819435 de5ab0a6

system/bta/BUILD.gn

+31 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ static_library("bta") { 
    "gatt/bta_gatts_api.cc",

    "gatt/bta_gatts_main.cc",

    "gatt/bta_gatts_utils.cc",

    "gatt/database.cc",

    "gatt/database_builder.cc",

    "hearing_aid/hearing_aid.cc",

    "hearing_aid/hearing_aid_audio_source.cc",

    "hf_client/bta_hf_client_act.cc",
@@ -101,6 +103,8 @@ static_library("bta") { 
    "include",

    "sys",

    "//",

    "//linux_include",

    "//bta",

    "//internal_include",

    "//btcore/include",

    "//hci/include",
@@ -121,5 +125,31 @@ static_library("bta") { 
  deps = [

    "//third_party/libchrome:base"

  ]

}



executable("net_test_bta") {

  testonly = true

  sources = [

        "test/gatt/database_builder_test.cc",

        "test/gatt/database_builder_sample_device_test.cc",

        "test/gatt/database_test.cc",

        "gatt/database.cc",

        "gatt/database_builder.cc",

  ]



  include_dirs = [

    "include",

    "//",

    "//bta",

    "//btcore/include",

    "//hci/include",

    "//internal_include",

    "//stack/btm",

  ]



  deps = [

    "//types",

    "//third_party/googletest:gmock_main",

    "//third_party/libchrome:base",

  ]

}
 
 No newline at end of file

system/bta/gatt/database.cc

+18 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2018 The Android Open Source Project

 *

 *  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.

 *

 ******************************************************************************/



#include "database.h"

#include "bt_trace.h"

#include "stack/include/gattdefs.h"

system/bta/gatt/database_builder.cc

+18 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2018 The Android Open Source Project

 *

 *  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.

 *

 ******************************************************************************/



#include "database_builder.h"



#include "bt_trace.h"

system/btif/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static_library("btif") { 
  include_dirs = [

    "include",

    "//",

    "//linux_include",

    "//audio_a2dp_hw/include",

    "//audio_hearing_aid_hw/include",

    "//bta/include",

system/btif/src/btif_sdp_server.cc

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


#define LOG_TAG "bt_btif_sdp_server"



#include <log/log.h>

#include <pthread.h>

#include <stdlib.h>

#include <string.h>