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

Unified Diff: content/content_browser.gypi

Issue 142223002: Support -Goutput_dir=blahblah in GN-GYP hybrid mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: prefer command line over env if both are specified 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 | « components/url_matcher.gypi ('k') | extensions/extensions.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 429785250c142745aa0c6c3f5075e1f4daccecdf..8ee4996b64e25beebe6c9de0245cffa4f7d9a483 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -4,11 +4,11 @@
{
'dependencies': [
+ '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
'../base/base.gyp:base_static',
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../net/net.gyp:net',
- '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../skia/skia.gyp:skia',
'../sql/sql.gyp:sql',
'../third_party/zlib/google/zip.gyp:zip',
« no previous file with comments | « components/url_matcher.gypi ('k') | extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698