diff options
| author | Christopher Wiley <wiley@google.com> | 2015-07-08 13:11:21 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-15 20:29:26 +0000 |
| commit | 8065d31cc3b24713bfa7f62f59c5a6ed0f235024 (patch) | |
| tree | 32c83936099b99321981e9af113d1e5157166111 /chromeos | |
| parent | 81ac44b1b4d125fcfd6b48b9bfdacecad14ce870 (diff) | |
| download | libbrillo-8065d31cc3b24713bfa7f62f59c5a6ed0f235024.tar.gz | |
Add libchromeos-glib for glib dependencies
This cleans up the dependency tree for daemons linking libchromeos
so that only those that actually need glib link against it.
BUG=chromium:508218
TEST=trybots
Change-Id: Iec92f061ae00b81bc440f4c58082adc6cdb059a3
Reviewed-on: https://chromium-review.googlesource.com/284079
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
Tested-by: Christopher Wiley <wiley@chromium.org>
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/glib/abstract_dbus_service.cc (renamed from chromeos/dbus/abstract_dbus_service.cc) | 2 | ||||
| -rw-r--r-- | chromeos/glib/abstract_dbus_service.h (renamed from chromeos/dbus/abstract_dbus_service.h) | 8 | ||||
| -rw-r--r-- | chromeos/glib/dbus.cc (renamed from chromeos/dbus/dbus.cc) | 2 | ||||
| -rw-r--r-- | chromeos/glib/dbus.h (renamed from chromeos/dbus/dbus.h) | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/chromeos/dbus/abstract_dbus_service.cc b/chromeos/glib/abstract_dbus_service.cc index e0040e0..d759427 100644 --- a/chromeos/dbus/abstract_dbus_service.cc +++ b/chromeos/glib/abstract_dbus_service.cc @@ -4,7 +4,7 @@ #include <base/logging.h> -#include "chromeos/dbus/abstract_dbus_service.h" +#include "chromeos/glib/abstract_dbus_service.h" namespace chromeos { namespace dbus { diff --git a/chromeos/dbus/abstract_dbus_service.h b/chromeos/glib/abstract_dbus_service.h index c6ae5c8..c351d2c 100644 --- a/chromeos/dbus/abstract_dbus_service.h +++ b/chromeos/glib/abstract_dbus_service.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LIBCHROMEOS_CHROMEOS_DBUS_ABSTRACT_DBUS_SERVICE_H_ -#define LIBCHROMEOS_CHROMEOS_DBUS_ABSTRACT_DBUS_SERVICE_H_ +#ifndef LIBCHROMEOS_CHROMEOS_GLIB_ABSTRACT_DBUS_SERVICE_H_ +#define LIBCHROMEOS_CHROMEOS_GLIB_ABSTRACT_DBUS_SERVICE_H_ #include <chromeos/chromeos_export.h> -#include <chromeos/dbus/dbus.h> +#include <chromeos/glib/dbus.h> namespace chromeos { @@ -47,4 +47,4 @@ class CHROMEOS_EXPORT AbstractDbusService { } // namespace dbus } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_DBUS_ABSTRACT_DBUS_SERVICE_H_ +#endif // LIBCHROMEOS_CHROMEOS_GLIB_ABSTRACT_DBUS_SERVICE_H_ diff --git a/chromeos/dbus/dbus.cc b/chromeos/glib/dbus.cc index ef44660..b825434 100644 --- a/chromeos/dbus/dbus.cc +++ b/chromeos/glib/dbus.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/dbus/dbus.h" +#include "chromeos/glib/dbus.h" #include <dbus/dbus.h> #include <dbus/dbus-glib-bindings.h> diff --git a/chromeos/dbus/dbus.h b/chromeos/glib/dbus.h index abde7dd..9ef012e 100644 --- a/chromeos/dbus/dbus.h +++ b/chromeos/glib/dbus.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LIBCHROMEOS_CHROMEOS_DBUS_DBUS_H_ -#define LIBCHROMEOS_CHROMEOS_DBUS_DBUS_H_ +#ifndef LIBCHROMEOS_CHROMEOS_GLIB_DBUS_H_ +#define LIBCHROMEOS_CHROMEOS_GLIB_DBUS_H_ #include <dbus/dbus-glib.h> #include <glib-object.h> @@ -465,4 +465,4 @@ class CHROMEOS_EXPORT SignalWatcher { } // namespace dbus } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_DBUS_DBUS_H_ +#endif // LIBCHROMEOS_CHROMEOS_GLIB_DBUS_H_ |