Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: remoting/remoting_version.gni

Issue 1250853007: Hook up chrome.exe manifest in the Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/BUILD.gn ('k') | remoting/webapp/build_template.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_version.gni
diff --git a/remoting/remoting_version.gni b/remoting/remoting_version.gni
index db117bd1b9bdec5c4c459a857db30bc842998f70..ac96c9ebf377b038b8e9fecb4beda00be0d8218e 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",
« no previous file with comments | « remoting/BUILD.gn ('k') | remoting/webapp/build_template.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698