diff options
| author | sky <sky@chromium.org> | 2016-02-23 15:18:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-23 23:21:09 +0000 |
| commit | d6439eceec0ac412e5ce440847609a4d807e0f90 (patch) | |
| tree | 2d98d90e8650bd485ec41fec9d4950e6f8ce61c5 /chrome/BUILD.gn | |
| parent | 11daa8bde0d19cf459ab49808e4aad6cecd768b6 (diff) | |
| download | chromium_src-d6439eceec0ac412e5ce440847609a4d807e0f90.zip chromium_src-d6439eceec0ac412e5ce440847609a4d807e0f90.tar.gz chromium_src-d6439eceec0ac412e5ce440847609a4d807e0f90.tar.bz2 | |
Adds ability for chrome to behave as mojo_runner
This adds the arg use_mash that is only true on chromeos. Once
compiled with use_mash if you supply --mash to chrome it'll start the
shell inside chrome.
I haven't wired chrome up to start in this environment. Will do that
next.
BUG=581539
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1722743002
Cr-Commit-Position: refs/heads/master@{#377113}
Diffstat (limited to 'chrome/BUILD.gn')
| -rw-r--r-- | chrome/BUILD.gn | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 4f9c6e8..506e0e2 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") import("//build/config/chrome_build.gni") import("//build/config/compiler/compiler.gni") import("//build/config/features.gni") @@ -11,6 +12,7 @@ import("//build/config/ui.gni") import("//build/config/win/console_app.gni") import("//build/config/win/manifest.gni") import("//chrome/chrome_repack_locales.gni") +import("//chrome/common/features.gni") import("//chrome/version.gni") declare_args() { @@ -187,6 +189,7 @@ if (!is_android) { public_deps = [ ":xdg_mime", # Needs to be public for installer to consume files. + "//chrome/common:features", ] # GYP has this in a 'profiling==0 and linux_disable_pie==0' condition. @@ -204,6 +207,10 @@ if (!is_android) { "//build/config/linux:xext", ] } + + if (enable_package_mash_services) { + deps += [ "//chrome/app/mash" ] + } } if (is_mac) { @@ -293,6 +300,7 @@ if (is_mac || is_win) { deps = [ ":browser_dependencies", "//build/config/sanitizers:deps", + "//chrome/common:features", ] if (is_win) { output_name = "chrome" @@ -369,6 +377,10 @@ if (is_mac || is_win) { if (enable_plugins && enable_pdf && !is_multi_dll_chrome) { deps += [ "//pdf" ] } + + if (enable_package_mash_services) { + deps += [ "//chrome/app/mash" ] + } } if (is_multi_dll_chrome) { @@ -395,6 +407,7 @@ if (is_mac || is_win) { ":chrome_child_manifest", ":chrome_dll_version", "//build/config/sanitizers:deps", + "//chrome/common:features", "//components/browser_watcher:browser_watcher_client", "//components/crash/content/app", "//content/public/app:child", |