From 625ec34106a70d9299c68593279a0d9c77bfd87f Mon Sep 17 00:00:00 2001 From: Arman Uguray Date: Wed, 10 Jun 2015 16:21:12 -0700 Subject: [PATCH] gn-build: Fix GN build after the merges This CL fixes the GN build after the recent merges to aosp/master. Change-Id: I0c9d8178986165d5a4a67261532e8a08b6923d22 --- btif/BUILD.gn | 3 +++ btif/src/btif_sdp_server.c | 4 ++-- btif/src/btif_sock_sco.c | 3 ++- hci/BUILD.gn | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/btif/BUILD.gn b/btif/BUILD.gn index 054ab85e7..e544031c6 100644 --- a/btif/BUILD.gn +++ b/btif/BUILD.gn @@ -20,6 +20,9 @@ static_library("btif") { "src/btif_config.c", "src/btif_config_transcode.cpp", "src/btif_core.c", + "src/btif_debug.c", + "src/btif_debug_btsnoop.c", + "src/btif_debug_conn.c", "src/btif_dm.c", "src/btif_gatt.c", "src/btif_gatt_client.c", diff --git a/btif/src/btif_sdp_server.c b/btif/src/btif_sdp_server.c index b3b29f9c1..567a4c09d 100644 --- a/btif/src/btif_sdp_server.c +++ b/btif/src/btif_sdp_server.c @@ -32,13 +32,13 @@ #include #define LOG_TAG "BTIF_SDP_SERVER" -#include "allocator.h" #include "btif_common.h" #include "btif_util.h" #include "bta_sdp_api.h" #include "bta_sys.h" -#include "utl.h" #include "btif_sock_util.h" +#include "osi/include/allocator.h" +#include "utl.h" static pthread_mutex_t sdp_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; diff --git a/btif/src/btif_sock_sco.c b/btif/src/btif_sock_sco.c index d64d787e4..e9bff91f1 100644 --- a/btif/src/btif_sock_sco.c +++ b/btif/src/btif_sock_sco.c @@ -29,9 +29,10 @@ #include #include "btif_common.h" +#include "osi/include/allocator.h" #include "osi/include/list.h" -#include "osi/include/osi.h" #include "osi/include/log.h" +#include "osi/include/osi.h" #include "osi/include/socket.h" #include "osi/include/thread.h" diff --git a/hci/BUILD.gn b/hci/BUILD.gn index cb4467f47..63b4ebcf5 100644 --- a/hci/BUILD.gn +++ b/hci/BUILD.gn @@ -17,6 +17,7 @@ static_library("hci") { sources = [ "src/btsnoop.c", + "src/btsnoop_mem.c", "src/btsnoop_net.c", "src/buffer_allocator.c", "src/hci_audio.c", -- 2.11.0