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

Unified Diff: chrome/app/BUILD.gn

Issue 468733003: GN: Fix build after r289163 / r289149. (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
« no previous file with comments | « no previous file | chrome/app/resources/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/BUILD.gn
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 80becce785e84f1d96c6c3f26b18f052f8998385..b226380bc08f6900a9cfeb20f46a3db3d8b3baef 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -8,6 +8,7 @@ import("//tools/grit/grit_rule.gni")
# (generate_generated_resources action)
grit("generated_resources") {
source = "generated_resources.grd"
+ output_dir = "$root_gen_dir/chrome"
outputs = [
"grit/generated_resources.h",
"generated_resources_am.pak",
@@ -74,8 +75,8 @@ action("make_generated_resources_map") {
script = "//chrome/browser/metrics/variations/generate_resources_map.py"
- inputs = [ "$target_gen_dir/grit/generated_resources.h" ]
- outputs = [ "$target_gen_dir/generated_resources_map.cc" ]
+ inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
+ outputs = [ "$root_gen_dir/chrome/generated_resources_map.cc" ]
args = rebase_path(inputs, root_build_dir) +
rebase_path(outputs, root_build_dir)
@@ -94,6 +95,7 @@ source_set("generated_resources_map") {
# (generate_google_chrome_strings action)
grit("google_chrome_strings") {
source = "google_chrome_strings.grd"
+ output_dir = "$root_gen_dir/chrome"
outputs = [
"grit/google_chrome_strings.h",
"google_chrome_strings_am.pak",
@@ -157,6 +159,7 @@ grit("google_chrome_strings") {
# (generate_chromium_strings action)
grit("chromium_strings") {
source = "chromium_strings.grd"
+ output_dir = "$root_gen_dir/chrome"
outputs = [
"grit/chromium_strings.h",
"chromium_strings_am.pak",
« no previous file with comments | « no previous file | chrome/app/resources/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698