summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Guggemos <jimg@google.com>2015-12-09 15:15:11 -0700
committerJim Guggemos <jimg@google.com>2015-12-09 15:19:58 -0700
commit997439e8a2f2315db7a93eff363fa505f5731cc5 (patch)
tree5981d024b2c0d56c66352b72814eb0b61109e4ef
parenteb7a12e8a7d774024db21b5aca2efe21c3b6ba35 (diff)
downloadcommon-brillo-m8-dev.tar.gz
Follow-on fixes from base/logging.h move to android-basebrillo-m8-releasebrillo-m8-dev
Bug: http://b/26023797 Change-Id: If3eca033ba4d29e9df0f1d8ba8c1f4605b260ef2
-rw-r--r--brillo_i2c/src/i2c_service/i2c_device.h2
-rw-r--r--brillo_i2c/src/i2c_service/i2c_service.cpp2
-rw-r--r--brillo_leds/src/brillo_led_tool/brillo_led_tool.cpp2
-rw-r--r--service_example/testservice.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/brillo_i2c/src/i2c_service/i2c_device.h b/brillo_i2c/src/i2c_service/i2c_device.h
index 781926d..62eec04 100644
--- a/brillo_i2c/src/i2c_service/i2c_device.h
+++ b/brillo_i2c/src/i2c_service/i2c_device.h
@@ -21,7 +21,7 @@
#include <fcntl.h>
#include <linux/i2c.h>
#include <linux/i2c-dev.h>
-#include <base/logging.h>
+#include <android-base/logging.h>
class I2CDevice {
diff --git a/brillo_i2c/src/i2c_service/i2c_service.cpp b/brillo_i2c/src/i2c_service/i2c_service.cpp
index 7208376..dd6f9c8 100644
--- a/brillo_i2c/src/i2c_service/i2c_service.cpp
+++ b/brillo_i2c/src/i2c_service/i2c_service.cpp
@@ -19,7 +19,7 @@
// pins 19 (SCL) and 21 (SDA).
-#include <base/logging.h>
+#include <android-base/logging.h>
#include "i2c_device.h"
diff --git a/brillo_leds/src/brillo_led_tool/brillo_led_tool.cpp b/brillo_leds/src/brillo_led_tool/brillo_led_tool.cpp
index 3f6845a..10454f7 100644
--- a/brillo_leds/src/brillo_led_tool/brillo_led_tool.cpp
+++ b/brillo_leds/src/brillo_led_tool/brillo_led_tool.cpp
@@ -1,5 +1,5 @@
#include <unistd.h>
-#include <base/logging.h>
+#include <android-base/logging.h>
int main(int argc __unused, char **argv __unused) {
static const char* const leds[] = {
diff --git a/service_example/testservice.cpp b/service_example/testservice.cpp
index 1e579b3..0317b31 100644
--- a/service_example/testservice.cpp
+++ b/service_example/testservice.cpp
@@ -18,7 +18,7 @@
#include <unistd.h>
-#include <base/logging.h>
+#include <android-base/logging.h>
int main(int argc __unused, char **argv __unused) {
LOG(INFO) << "starting";