diff options
| author | sky <sky@chromium.org> | 2015-08-06 18:06:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 01:07:34 +0000 |
| commit | add030b55dee834423004bde2a0d92afd8a7be7e (patch) | |
| tree | d7e3af2db33ba8e700d15a80f40a003336ba9523 /mandoline | |
| parent | 1efe8793da85ee6e25185175047c077adfe8e55c (diff) | |
| download | chromium_src-add030b55dee834423004bde2a0d92afd8a7be7e.zip chromium_src-add030b55dee834423004bde2a0d92afd8a7be7e.tar.gz chromium_src-add030b55dee834423004bde2a0d92afd8a7be7e.tar.bz2 | |
Straightens outs DEPS in mojo/common
Prior to this change //mojo/environment depended upon //mojo/common. //mojo/common's deps are wrong and it needs to be depend upon various things in //third_party/mojo/src/mojo... When these DEPS are added link errors result because Environment and and a couple of other things need to be defined. These are defined in //mojo/environment. But //mojo/environment can't be a dep of //mojo/common, else we get a cycle.
To straighten this out I've moved the files //mojo/environment needs from //mojo/common to //mojo/message_pump. //mojo/environment no longer depends upon //mojo/common, only //mojo/message_pump. //mojo/common can then depend upon //mojo/environment and we no longer have the cycle. Yay!
BUG=none
TEST=none
Committed: https://crrev.com/a11b4d76a27816fe025af647825becac5f633c34
Cr-Commit-Position: refs/heads/master@{#341979}
Review URL: https://codereview.chromium.org/1262173005
Cr-Commit-Position: refs/heads/master@{#342252}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/services/core_services/BUILD.gn | 1 | ||||
| -rw-r--r-- | mandoline/services/core_services/DEPS | 1 | ||||
| -rw-r--r-- | mandoline/services/core_services/core_services_application_delegate.cc | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn index 84808a5..2a34b61 100644 --- a/mandoline/services/core_services/BUILD.gn +++ b/mandoline/services/core_services/BUILD.gn @@ -47,6 +47,7 @@ source_set("sources") { "//mandoline/ui/browser:lib", "//mojo/application/public/cpp", "//mojo/common:tracing_impl", + "//mojo/message_pump", "//mojo/services/tracing:lib", "//third_party/mojo/src/mojo/public/cpp/bindings", ] diff --git a/mandoline/services/core_services/DEPS b/mandoline/services/core_services/DEPS index 308fa909..90dcddc 100644 --- a/mandoline/services/core_services/DEPS +++ b/mandoline/services/core_services/DEPS @@ -5,6 +5,7 @@ include_rules = [ "+components/view_manager", "+mojo/application", "+mojo/common", + "+mojo/message_pump", "+mojo/services/network", "+mojo/services/tracing", "+net", diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc index e3ff977..7805164 100644 --- a/mandoline/services/core_services/core_services_application_delegate.cc +++ b/mandoline/services/core_services/core_services_application_delegate.cc @@ -14,7 +14,7 @@ #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" -#include "mojo/common/message_pump_mojo.h" +#include "mojo/message_pump/message_pump_mojo.h" #include "mojo/services/tracing/tracing_app.h" #include "url/gurl.h" |