diff options
| author | brettw <brettw@chromium.org> | 2015-07-21 21:26:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-22 04:27:41 +0000 |
| commit | 983c0562bba1e4d93bb7ee489f56bcbd61fc55f9 (patch) | |
| tree | 34dc4d88c58d0ff04997f39850fe7062ce0c09b9 /remoting/remoting_version.gni | |
| parent | 0355eead6c2048131771feb493187f6f80155cf6 (diff) | |
| download | chromium_src-983c0562bba1e4d93bb7ee489f56bcbd61fc55f9.zip chromium_src-983c0562bba1e4d93bb7ee489f56bcbd61fc55f9.tar.gz chromium_src-983c0562bba1e4d93bb7ee489f56bcbd61fc55f9.tar.bz2 | |
Hook up chrome.exe manifest in the Windows GN build.
This generates a proper version manifest for chrome.exe and also for the version assembly.
This adds a new way to get the chrome version info programatically at GN time. Although this adds another exec_script call, it removes four such calls in remoting so there is a net speed increase.
BUG=
Review URL: https://codereview.chromium.org/1250853007
Cr-Commit-Position: refs/heads/master@{#339833}
Diffstat (limited to 'remoting/remoting_version.gni')
| -rw-r--r-- | remoting/remoting_version.gni | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/remoting/remoting_version.gni b/remoting/remoting_version.gni index db117bd..ac96c9e 100644 --- a/remoting/remoting_version.gni +++ b/remoting/remoting_version.gni @@ -6,7 +6,6 @@ import("//build/config/chrome_build.gni") _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 { @@ -17,58 +16,13 @@ if (is_chrome_branded) { # be re-run if the files change. remoting_version_files = [ _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, - [ - "-f", - _chrome_version_path, - "-f", - _remoting_version_path, - "-t \"@MAJOR@\"", - ], - "value", - remoting_version_files) - -version_minor = exec_script(_version_py_abspath, - [ - "-f", - _remoting_version_path, - "-t \"@REMOTING_PATCH@\"", - ], - "value", - remoting_version_files) - -version_short = - "${version_major}.${version_minor}." + exec_script(_version_py_abspath, - [ - "-f", - _chrome_version_path, - "-f", - _remoting_version_path, - "-t \"@BUILD@\"", - ], - "value", - remoting_version_files) - -version_full = "${version_short}." + exec_script(_version_py_abspath, - [ - "-f", - _chrome_version_path, - "-f", - _remoting_version_path, - "-t \"@PATCH@\"", - ], - "value", - remoting_version_files) - prefpane_bundle_name = exec_script(_version_py_abspath, [ "-f", |