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

Unified Diff: chrome/common/BUILD.gn

Issue 489223002: Add chrome, installer_util targets to GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
Index: chrome/common/BUILD.gn
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index c914632684b7e5792bd391e45cd459676b148247..1903837dc8838cbf29cd57a9663394dc6992f5f8 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -52,6 +52,7 @@ static_library("common") {
"//chrome/common:constants",
"//chrome/common/net",
"//chrome/common/safe_browsing:proto",
+ "//chrome/installer/util",
"//components/cloud_devices/common",
"//components/content_settings/core/common",
"//components/json_schema",
@@ -63,6 +64,7 @@ static_library("common") {
"//crypto",
"//extensions:extensions_resources",
"//extensions/strings",
+ "//media/cast:net",
"//net",
"//skia",
"//third_party/icu",
@@ -71,8 +73,6 @@ static_library("common") {
"//third_party/zlib:zip",
"//ui/resources:resources",
"//url",
- #":installer_util", TODO(GYP)
- #"//media/cast/cast.gyp:cast_transport", TODO(GYP)
]
if (is_ios) {
@@ -90,12 +90,12 @@ static_library("common") {
"//components/password_manager/core/common",
"//components/signin/core/common",
"//components/translate/content/common",
+ "//extensions/common",
"//extensions/common/api",
"//ipc",
"//third_party/adobe/flash:flapper_version_h",
"//third_party/re2",
"//third_party/widevine/cdm:version_h",
- #'<(DEPTH)/extensions/extensions.gyp:extensions_common', TODO(GYP)
]
}
@@ -232,36 +232,13 @@ static_library("common") {
}
if (is_linux) {
- action("version") {
+ # TODO(brettw) this duplicates "//chrome/common:version" which applies to
+ # Windows.
+ import("//chrome/version.gni")
+ process_version("version") {
visibility = ":common"
- script = "//build/util/version.py"
-
- lastchange_path = "//build/util/LASTCHANGE"
- version_path = "//chrome/VERSION"
- template_input_path = "chrome_version_info_posix.h.version"
- if (is_chrome_branded) {
- branding_path = "//chrome/app/theme/google_chrome/BRANDING"
- } else {
- branding_path = "//chrome/app/theme/chromium/BRANDING"
- }
-
- inputs = [
- version_path,
- template_input_path,
- lastchange_path,
- branding_path,
- ]
-
- outfile = "$target_gen_dir/chrome_version_info_posix.h"
- outputs = [ outfile ]
-
- args = [
- "-f", rebase_path(version_path, root_build_dir),
- "-f", rebase_path(branding_path, root_build_dir),
- "-f", rebase_path(lastchange_path, root_build_dir),
- rebase_path(template_input_path, root_build_dir),
- rebase_path(outfile, root_build_dir),
- ]
+ source = "chrome_version_info_posix.h.version"
+ output = "$target_gen_dir/chrome_version_info_posix.h"
}
} else {
# Other platforms have a different way to do versioning.

Powered by Google App Engine
This is Rietveld 408576698