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

Unified Diff: gpu/command_buffer_service.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 | « extensions/extensions.gyp ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer_service.gypi
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
index 60f8fb0097a7ffc1e05aef14b75c056686509c7d..4d4b74ed908e8b82db89b987c9e1b9535c5f1a03 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -12,6 +12,7 @@
],
},
'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',
'../crypto/crypto.gyp:crypto',
@@ -23,7 +24,6 @@
'../third_party/khronos/khronos.gyp:khronos_headers',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/smhasher/smhasher.gyp:cityhash',
- '../out/gn_gyp/third_party/re2/re2.gyp:re2',
],
'sources': [
'command_buffer/service/async_pixel_transfer_delegate.cc',
« no previous file with comments | « extensions/extensions.gyp ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698