diff options
| author | peter <peter@chromium.org> | 2016-03-17 11:25:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 18:27:05 +0000 |
| commit | 05725db3438ca433acc02d136acb49a8cc535375 (patch) | |
| tree | 154d2e01051ff3af70ae1f3cac6c38de1263860c /mojo | |
| parent | 389eae98c8534ef24576d0929c94b81b9ca02857 (diff) | |
| download | chromium_src-05725db3438ca433acc02d136acb49a8cc535375.zip chromium_src-05725db3438ca433acc02d136acb49a8cc535375.tar.gz chromium_src-05725db3438ca433acc02d136acb49a8cc535375.tar.bz2 | |
Mojo's WTF dependencies should be set correctly regardless the path depth
Dependency resolution in gyp uses relative paths from the target, so usage
of the `for_blink` variable fails for any target that doesn't immediately
live in //mojo. This is different from GN, where the dependency is
declared absolutely: //mojo/public/cpp/bindings:wtf_support
BUG=583738
Review URL: https://codereview.chromium.org/1808253002
Cr-Commit-Position: refs/heads/master@{#381751}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojom_bindings_generator.gypi | 4 | ||||
| -rw-r--r-- | mojo/mojom_bindings_generator_explicit.gypi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mojo/mojom_bindings_generator.gypi b/mojo/mojom_bindings_generator.gypi index 6518ee4..bcf98b2 100644 --- a/mojo/mojom_bindings_generator.gypi +++ b/mojo/mojom_bindings_generator.gypi @@ -37,8 +37,8 @@ '--for_blink', ], 'wtf_dependencies%': [ - 'mojo_public.gyp:mojo_cpp_bindings_wtf_support', - '../third_party/WebKit/Source/wtf/wtf.gyp:wtf', + '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings_wtf_support', + '<(DEPTH)/third_party/WebKit/Source/wtf/wtf.gyp:wtf', ], }, { 'mojom_generator_wtf_arg%': [], diff --git a/mojo/mojom_bindings_generator_explicit.gypi b/mojo/mojom_bindings_generator_explicit.gypi index 0ca10c6..599ee3b 100644 --- a/mojo/mojom_bindings_generator_explicit.gypi +++ b/mojo/mojom_bindings_generator_explicit.gypi @@ -32,8 +32,8 @@ '--for_blink', ], 'wtf_dependencies%': [ - 'mojo_public.gyp:mojo_cpp_bindings_wtf_support', - '../third_party/WebKit/Source/wtf/wtf.gyp:wtf', + '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings_wtf_support', + '<(DEPTH)/third_party/WebKit/Source/wtf/wtf.gyp:wtf', ], }, { 'mojom_generator_wtf_arg%': [], |