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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/toolchain/linux/BUILD.gn

Issue 140763006: Use ~/.gyp/include.gypi in GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix error if .gyp doesn't exist Created 6 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 | « build/gyp_chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/linux/BUILD.gn
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index f62b99a7c696c9af588b0f5781fd0c08d8fabd9c..30dc022096d05c386dbb45e3d43659dcb2c6d2ba 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -29,10 +29,10 @@ if (is_gyp) {
# generator set.
gyp_header =
"'conditions':" +
- "['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" +
+ "[['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" +
make_global_settings +
make_goma_global_settings +
- "]}],"
+ "]}]],"
} else {
gyp_header = "'make_global_settings': [" + make_global_settings + "],"
}
« no previous file with comments | « build/gyp_chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698