From 6aa7dc21c3778a4c0cf50c9eae18aa08cc38642c Mon Sep 17 00:00:00 2001 From: Arman Uguray Date: Wed, 8 Jul 2015 15:47:39 -0700 Subject: gn-build: Add bluetooth-service target This patch makes the Bluetooth system service (service/) buildable using GN: 1. Added new BUILD.gn file for service/ 2. Added conditional compilation for global config paths, with TODOs for generalizing them later. 3. Added a shim for loading the Bluetooth library that calls hw_get_module on Android and explicitly calls dlopen on OS_GENERIC. 4. Fixed compile warnings and errors. 5. Did some minor clean up in gatt_server.cpp for better readability. Bug: 22124644 Change-Id: I3226537a3a5211a6762651a35707638df29956b0 --- system/service/uuid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/service/uuid.cpp') diff --git a/system/service/uuid.cpp b/system/service/uuid.cpp index 13e21a1488..c48ba5e087 100644 --- a/system/service/uuid.cpp +++ b/system/service/uuid.cpp @@ -24,8 +24,8 @@ namespace bluetooth { void Uuid::InitializeDefault() { // Initialize to base bluetooth UUID. - id_ = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, - 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}; + id_ = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}}; } Uuid::Uuid() { -- cgit v1.2.3-59-g8ed1b