diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 23:51:41 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 23:51:41 +0000 |
| commit | 43c9dcc97bbaf0e9859d611636f820377fca4b77 (patch) | |
| tree | dbe711b7a9fc8d226332c7dcf18db55b555d58ee /chrome/tools | |
| parent | 889a157761458aa666b0af71c392bdfd21c27799 (diff) | |
| download | chromium_src-43c9dcc97bbaf0e9859d611636f820377fca4b77.zip chromium_src-43c9dcc97bbaf0e9859d611636f820377fca4b77.tar.gz chromium_src-43c9dcc97bbaf0e9859d611636f820377fca4b77.tar.bz2 | |
Support -Goutput_dir=blahblah in GN-GYP hybrid mode
This supports specifying the output_dir generator flag in the gn-generating-gyp
mode. The value of the output_dir flag is mapped to a gyp variable called gyp_output_dir
and a GN argument by the same name. References from gyp to gn-generated gyp files must
use this variable and references from BUILD.gn files must use the gn argument.
BUG=335760
TBR=brettw for build/config/BUILDCONFIG.gn (looked at in person)
Review URL: https://codereview.chromium.org/142223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/profile_reset/jtl_compiler.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/tools/profile_reset/jtl_compiler.gyp b/chrome/tools/profile_reset/jtl_compiler.gyp index cd445c5..f78c25e 100644 --- a/chrome/tools/profile_reset/jtl_compiler.gyp +++ b/chrome/tools/profile_reset/jtl_compiler.gyp @@ -22,8 +22,8 @@ 'type': 'static_library', 'product_name': 'jtl_compiler', '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', ], 'sources': [ '../../browser/profile_resetter/jtl_foundation.h', |