commit b4a42e7b9c277cfd71a575cbdb104013855b80cd
author Bluetooth Build Test <test@build.com> Thu Apr 07 14:10:40 2016 +0200
committer Jakub Pawlowski <jpawlowski@google.com> Tue Apr 12 18:44:23 2016 +0000
tree 2a8817c728321311be3493bcbb0273b61816027b
parent 431885e7b6fb0ffc861571b907d3f66963333c2a

Linux build fix

* add missing LOG_TAG definition
* add missing LOG_TAG inside LOG statements
* remove unnecessary includes of cutils/*.h files
* update libchrome/BUILD.gn to be on par with latest version of
  library used in Android

Bug: 28094186
Change-Id: I19a07afac20789b42a070995f6aa9da68b1bb940

service/main.cpp

diff --git a/service/main.cpp b/service/main.cpp
index 3ab81e6..fc5eec6 100644
--- a/service/main.cpp
+++ b/service/main.cpp
@@ -23,12 +23,7 @@
 #include <base/files/scoped_file.h>
 #include <base/logging.h>
 
-// For system properties
-// TODO(icoolidge): abstraction or non-cutils stub.
-#if !defined(OS_GENERIC)
-#include <cutils/properties.h>
-#endif  // !defined(OS_GENERIC)
-
+#include "osi/include/properties.h"
 #include "service/daemon.h"
 #include "service/switches.h"