diff options
| author | sammc <sammc@chromium.org> | 2015-01-29 18:20:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 02:21:22 +0000 |
| commit | b02c427dcb9f3cfa5c84ec685e0f1d52cd8fba9f (patch) | |
| tree | 7c8f0f64d558aa3a062ffa9c56df532bf47b3993 /mojo/mojo_base.gyp | |
| parent | 7971a8963de8fa6db33d5f0c9dab91f41b61b9bd (diff) | |
| download | chromium_src-b02c427dcb9f3cfa5c84ec685e0f1d52cd8fba9f.zip chromium_src-b02c427dcb9f3cfa5c84ec685e0f1d52cd8fba9f.tar.gz chromium_src-b02c427dcb9f3cfa5c84ec685e0f1d52cd8fba9f.tar.bz2 | |
Copy build changes to compile mojo::AsyncWaiter to the chromium repo.
mojo::AsyncWaiter was added to mojo/public/cpp/environment in
https://github.com/domokit/mojo/commit/2b6c27fbbe9b704a77e977615b945f364bf520ca
and was rolled into chromium. However, the chromium environment
implementation is on mojo/environment, which is maintained independently
of the version in the mojo repo. This CL copies the mojo repo's
mojo/environment into the chromium repo so that mojo::AsyncWaiter is
usable there.
Review URL: https://codereview.chromium.org/883583005
Cr-Commit-Position: refs/heads/master@{#313859}
Diffstat (limited to 'mojo/mojo_base.gyp')
| -rw-r--r-- | mojo/mojo_base.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index 2000120..c0d4bac 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -95,10 +95,13 @@ 'type': 'static_library', 'dependencies': [ 'mojo_environment_chromium_impl', + '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', ], 'sources': [ 'environment/environment.cc', # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) + "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", + "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc", "../third_party/mojo/src/mojo/public/cpp/environment/logging.h", "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", ], |