commit ce360bb3e2fa528cddded4e1cfc359c9e80b4970
author Alex Vakulenko <avakulenko@google.com> Sat Jan 23 21:05:16 2016 +0000
committer Alex Vakulenko <avakulenko@google.com> Sat Jan 23 21:05:16 2016 +0000
tree a906d83330690bab2012cb62fb159d4d2d1805f1
parent a3e8746e75e0d740ac1e7b58da86fad2e619b3a9

Revert "update_engine: Fix compile errors on Chrome OS"

This reverts commit a3e8746e75e0d740ac1e7b58da86fad2e619b3a9.

Change-Id: If6cc797fbb93a0ba2365191ecd52f2fba9df92f8

daemon.cc

diff --git a/daemon.cc b/daemon.cc
index 64f3775..838c407 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -25,9 +25,9 @@
 #include <binderwrapper/binder_wrapper.h>
 #endif  // USE_WEAVE || USE_BINDER
 
-#if defined(__BRILLO__) || defined(USE_DBUS)
+#ifdef __BRILLO__
 #include "update_engine/update_attempter.h"
-#endif  // __BRILLO__ || USE_DBUS
+#endif  // __BRILLO__
 
 #if USE_DBUS
 namespace {
@@ -67,7 +67,7 @@
   CHECK(bus->SetUpAsyncOperations());
 #endif // USE_DBUS
 
-#if defined(__BRILLO__) || defined(USE_DBUS)
+#ifdef __BRILLO__
   // Initialize update engine global state but continue if something fails.
   real_system_state_.reset(new RealSystemState(bus));
   LOG_IF(ERROR, !real_system_state_->Initialize())