commit d6deb1d0357f47d5525bfaeffa6c201b19abd3e7
author Alex Deymo <deymo@google.com> Fri Aug 28 15:54:37 2015 -0700
committer Alex Deymo <deymo@google.com> Tue Sep 01 19:25:12 2015 -0700
tree 40d0f18ca57ef6ee7ad9f8b7e1cec42d3f4e369d
parent 46e9b1735a16518d563b3c7e7227408f8fc3e891

Use installed DBus libraries instead of generating them.

login_manager, power_manager, debugd and shill now expose a client
library with the generated dbus-proxies.h file and the system_api's
installed dbus-constants.h. This patch changes update_engine from
generating these DBus headers to use the installed client libraries.

The client libraries already include the service path string, so we
don't need to include system_api dbus-constants.h in most cases, unless
we actually use some parameter constants defined there.

BUG=b:23084776,b:23560718
TEST=./build_packages --board=link

Change-Id: Idb4501e784ebb5928c92902d114462be57d5826a

dbus_service.cc

diff --git a/dbus_service.cc b/dbus_service.cc
index 7bf8a69..9f6a844 100644
--- a/dbus_service.cc
+++ b/dbus_service.cc
@@ -26,10 +26,10 @@
 #include <chromeos/message_loops/message_loop.h>
 #include <chromeos/strings/string_utils.h>
 #include <policy/device_policy.h>
+#include <update_engine/dbus-constants.h>
 
 #include "update_engine/clock_interface.h"
 #include "update_engine/connection_manager_interface.h"
-#include "update_engine/dbus_constants.h"
 #include "update_engine/hardware_interface.h"
 #include "update_engine/omaha_request_params.h"
 #include "update_engine/p2p_manager.h"
@@ -40,10 +40,10 @@
 using base::StringPrintf;
 using chromeos::ErrorPtr;
 using chromeos::string_utils::ToString;
-using chromeos_update_engine::AttemptUpdateFlags;
-using chromeos_update_engine::kAttemptUpdateFlagNonInteractive;
 using std::set;
 using std::string;
+using update_engine::AttemptUpdateFlags;
+using update_engine::kAttemptUpdateFlagNonInteractive;
 
 namespace {
 // Log and set the error on the passed ErrorPtr.
@@ -53,7 +53,7 @@
   chromeos::Error::AddTo(
       error, location,
       chromeos::errors::dbus::kDomain,
-      chromeos_update_engine::kUpdateEngineServiceErrorFailed, reason);
+      update_engine::kUpdateEngineServiceErrorFailed, reason);
   LOG(ERROR) << "Sending DBus Failure: " << location.ToString() << ": "
              << reason;
 }
@@ -337,7 +337,9 @@
     : org::chromium::UpdateEngineInterfaceAdaptor(&dbus_service_),
     bus_(bus),
     dbus_service_(system_state),
-    dbus_object_(nullptr, bus, dbus::ObjectPath(kUpdateEngineServicePath)) {}
+    dbus_object_(nullptr,
+                 bus,
+                 dbus::ObjectPath(update_engine::kUpdateEngineServicePath)) {}
 
 void UpdateEngineAdaptor::RegisterAsync(
     const base::Callback<void(bool)>& completion_callback) {
@@ -346,7 +348,7 @@
 }
 
 bool UpdateEngineAdaptor::RequestOwnership() {
-  return bus_->RequestOwnershipAndBlock(kUpdateEngineServiceName,
+  return bus_->RequestOwnershipAndBlock(update_engine::kUpdateEngineServiceName,
                                         dbus::Bus::REQUIRE_PRIMARY);
 }