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

Unified Diff: gpu/gpu_config.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 | « gpu/command_buffer_service.gypi ('k') | third_party/leveldatabase/leveldatabase.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu_config.gypi
diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi
index 8d35a967085da4abe53f3e5f09d6da4613bc8ef9..c44da7478309bb9b7db278e45f05d6672b4649a5 100644
--- a/gpu/gpu_config.gypi
+++ b/gpu/gpu_config.gypi
@@ -4,8 +4,8 @@
{
'dependencies': [
+ '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
'../base/base.gyp:base',
- '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../ui/gl/gl.gyp:gl',
],
'include_dirs': [
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | third_party/leveldatabase/leveldatabase.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698