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

Unified Diff: chrome/test/BUILD.gn

Issue 874413003: Add targets for generating version files in Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issues after review, update GYP. Created 5 years, 11 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 | « chrome/common_constants.gyp ('k') | chrome/tools/build/make_version_cc.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index e2f3c38e5f362864c5779b659f81607053e32cc3..1dd6b3e9e8c39e91c0110d7155db3f9a4fdbde56 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -372,15 +372,14 @@ if (!is_android) {
# direct_dependent_settings in their various targets
# (net.gyp:net_resources, etc.), but that causes errors in other
# targets when resulting .res files get referenced multiple times.
- #"$root_gen_dir/chrome_version/other_version.rc", TODO(GYP) what generates this?
+ "$root_gen_dir/chrome/other_version.rc",
"$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
]
deps += [
+ "//chrome:chrome_version_resources",
"//third_party/isimpledom",
"//third_party/wtl",
"//ui/resources",
-
- # 'chrome.gyp:chrome_version_resources' TODO(GYP)
]
}
@@ -840,11 +839,11 @@ if (!is_android) {
}
if (is_win) {
sources += [
- #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP)
+ "$root_gen_dir/chrome/other_version.rc",
"$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
]
deps += [
- #'chrome_version_resources', TODO(GYP)
+ "//chrome:chrome_version_resources",
"//third_party/wtl",
"//ui/resources",
]
@@ -1072,14 +1071,13 @@ if (!is_android) {
}
if (is_win) {
sources += [
- #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP)
+ "$root_gen_dir/chrome/other_version.rc",
"$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
]
deps += [
+ "//chrome:chrome_version_resources",
"//third_party/wtl",
"//ui/resources",
-
- #'chrome_version_resources', TODO(GYP)
]
} else {
sources -= [ "../app/chrome_version.rc.version" ]
@@ -1139,14 +1137,13 @@ if (!is_android) {
}
if (is_win) {
sources += [
- #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP)
+ "$root_gen_dir/chrome/other_version.rc",
"$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
]
deps += [
+ "//chrome:chrome_version_resources",
"//third_party/wtl",
"//ui/resources",
-
- #'chrome_version_resources', TODO(GYP)
]
} else {
sources -= [ "../app/chrome_version.rc.version" ]
« no previous file with comments | « chrome/common_constants.gyp ('k') | chrome/tools/build/make_version_cc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698