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

Unified Diff: components/url_matcher.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/plugins.gypi ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/url_matcher.gypi
diff --git a/components/url_matcher.gypi b/components/url_matcher.gypi
index da057dee55e6b0c02292ac5b2ba1d070f2ce99f2..348795abbe38c6a4c3fbcde6a7b4348a1c4de734 100644
--- a/components/url_matcher.gypi
+++ b/components/url_matcher.gypi
@@ -8,9 +8,9 @@
'target_name': 'url_matcher',
'type': '<(component)',
'dependencies': [
+ '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../url/url.gyp:url_lib',
],
'include_dirs': [
« no previous file with comments | « components/plugins.gypi ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698