commit c92195c0f6cba4851b7352062bba03c95b7a7e94
author Sen Jiang <senj@google.com> Mon Jun 13 15:48:44 2016 -0700
committer Sen Jiang <senj@google.com> Mon Jun 20 20:09:38 2016 +0000
tree ca8ce004b90286de054e2cb2ed36a9e342f2d560
parent aeeb2e015ef5ef046c744d3c5daa7f353eb71b4e

Compile libupdate_engine without DBus.

Test: mma with and without BRILLO_USE_DBUS=1
Test: adb shell /data/nativetest/update_engine_unittests/update_engine_unittests
Bug: 28800946

Change-Id: If3b05e7bc7a123d3d9b0dcc4597d915249a2de33

update_attempter.h

diff --git a/update_attempter.h b/update_attempter.h
index 5dbe3dd..78b35f0 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -29,13 +29,16 @@
 #include <base/time/time.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
+#if USE_DBUS
 #include "debugd/dbus-proxies.h"
+#endif // USE_DBUS
+#if USE_LIBCROS
 #include "update_engine/chrome_browser_proxy_resolver.h"
+#endif  // USE_LIBCROS
 #include "update_engine/client_library/include/update_engine/update_status.h"
 #include "update_engine/common/action_processor.h"
 #include "update_engine/common/certificate_checker.h"
 #include "update_engine/common/cpu_limiter.h"
-#include "update_engine/libcros_proxy.h"
 #include "update_engine/omaha_request_params.h"
 #include "update_engine/omaha_response_handler_action.h"
 #include "update_engine/payload_consumer/download_action.h"
@@ -55,6 +58,7 @@
 
 namespace chromeos_update_engine {
 
+class LibCrosProxy;
 class UpdateEngineAdaptor;
 
 class UpdateAttempter : public ActionProcessorDelegate,
@@ -506,7 +510,9 @@
   std::string forced_app_version_;
   std::string forced_omaha_url_;
 
+#if USE_DBUS
   std::unique_ptr<org::chromium::debugdProxyInterface> debugd_proxy_;
+#endif // USE_DBUS
 
   DISALLOW_COPY_AND_ASSIGN(UpdateAttempter);
 };