diff options
| author | kelvinp <kelvinp@chromium.org> | 2014-11-12 13:31:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-12 21:32:09 +0000 |
| commit | 98a7506987dccd2f6456d5d8399a215a4ab01590 (patch) | |
| tree | da32b2d8e98d1c5963eb016a2528abb1951a2b3a /remoting/remoting_version.gni | |
| parent | f3571bb88d9cffd4ea6f3143ef2e73b3021e057c (diff) | |
| download | chromium_src-98a7506987dccd2f6456d5d8399a215a4ab01590.zip chromium_src-98a7506987dccd2f6456d5d8399a215a4ab01590.tar.gz chromium_src-98a7506987dccd2f6456d5d8399a215a4ab01590.tar.bz2 | |
Convert remoting_it2me_host_static to GN
GN builds are enabled by default on buildbots for Chrome OS with Ozone.
Since remote assistance is part of the Chrome binary on Chrome OS, it needs
to be migrated to GN.
This CL migrates the target remoting_it2me_host_static and its dependencies to GN
on Chrome OS. Specifically this CL:
1. Pulls out the sources from remoting_host.gypi into remoting_host_srcs.gypi,
which is shared by both GYP and GN.
2. Creates a BUILD.gn file for remoting/host and remoting/host/it2me
3. Makes //chrome/browser/extensions depends on //remoting/host/it2me:common
4. Modifies remoting_versions.gni to handle branding.
BUG=432358
Review URL: https://codereview.chromium.org/719603002
Cr-Commit-Position: refs/heads/master@{#303897}
Diffstat (limited to 'remoting/remoting_version.gni')
| -rw-r--r-- | remoting/remoting_version.gni | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/remoting/remoting_version.gni b/remoting/remoting_version.gni index 2ff0b10..53e8339 100644 --- a/remoting/remoting_version.gni +++ b/remoting/remoting_version.gni @@ -2,27 +2,27 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# TODO(brettw) Forking out to Python 4 times in serial just to get version -# numbers is highly undesirable. Instead, there should be a build step to -# generate an appropriate header so that the version can be generated at -# build-time, and not at GN-time. - -# The |major|, |build| and |patch| versions are inherited from Chrome. -# Since Chrome's |minor| version is always '0', we replace it with a -# Chromoting-specific patch version. -# Note that we check both the |chrome_version_path| file and the -# |remoting_version_path| so that we can override the Chrome version -# numbers if needed. _version_py_abspath = "//build/util/version.py" _remoting_version_abspath = "//remoting/VERSION" _chrome_version_abspath = "//chrome/VERSION" +if (is_chrome_branded) { + _remoting_branding_abspath = "//remoting/branding_Chrome" +} else { + _remoting_branding_abspath = "//remoting/branding_Chromium" +} # Set these files as being input dependencies to the scripts, so the build will # be re-run if the files change. -_script_deps = [ _remoting_version_abspath, _chrome_version_abspath ] +_script_deps = [ + _remoting_version_abspath, + _chrome_version_abspath, + _remoting_branding_abspath, +] _chrome_version_path = rebase_path(_chrome_version_abspath, root_build_dir) _remoting_version_path = rebase_path(_remoting_version_abspath, root_build_dir) +_remoting_branding_path = rebase_path(_remoting_branding_abspath, + root_build_dir) version_major = exec_script( _version_py_abspath, @@ -54,3 +54,17 @@ version_full = "${version_short}." + exec_script( "-t \"@PATCH@\"" ], "value", _script_deps) + +prefpane_bundle_name = exec_script( + _version_py_abspath, + [ "-f", _remoting_branding_path, + "-t \"@MAC_PREFPANE_BUNDLE_NAME@\"" ], + "value", + _script_deps) + +host_bundle_name = exec_script( + _version_py_abspath, + [ "-f", _remoting_branding_path, + "-t \"@MAC_HOST_BUNDLE_NAME@\"" ], + "value", + _script_deps) |