diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 10:46:21 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 10:47:56 +0000 |
| commit | 07a4f2ee1eece1a8708ab9e39f50e9d28ca988cd (patch) | |
| tree | 83cb9bdc5efb679afba83a78d03f0e5a29bbf92d /mojo/mojo_base.gyp | |
| parent | d9b94e60f7e1f42b30c45ef69a641c1d6aba129a (diff) | |
| download | chromium_src-07a4f2ee1eece1a8708ab9e39f50e9d28ca988cd.zip chromium_src-07a4f2ee1eece1a8708ab9e39f50e9d28ca988cd.tar.gz chromium_src-07a4f2ee1eece1a8708ab9e39f50e9d28ca988cd.tar.bz2 | |
mojo: first take on removing mojo_main_{chromium,standalone}.
* Adds ApplicationRunner{Chromium} to house common code.
* Makes 'application_{chromium, standalone}' target depend on the appropriate
environment target. Since application_{c,s} house different Runner types
altogether, linking against the wrong application lib would yield unresolved
externals. linking against a {wrong} environment lib would now result in
duplicately defined symbols. So these changes help crbug.com/334543.
BUG=334543
Review URL: https://codereview.chromium.org/441853002
Cr-Commit-Position: refs/heads/master@{#291039}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_base.gyp')
| -rw-r--r-- | mojo/mojo_base.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index b3c3449..3e5d758 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -416,10 +416,12 @@ 'target_name': 'mojo_application_chromium', 'type': 'static_library', 'sources': [ - 'public/cpp/application/lib/application_impl_chromium.cc', + 'public/cpp/application/lib/application_runner_chromium.cc', + 'public/cpp/application/application_runner_chromium.h', ], 'dependencies': [ 'mojo_application_base', + 'mojo_environment_chromium', ], 'export_dependent_settings': [ 'mojo_application_base', |