diff options
| author | Colin Blundell <blundell@chromium.org> | 2015-01-08 10:07:42 +0100 |
|---|---|---|
| committer | Colin Blundell <blundell@chromium.org> | 2015-01-08 09:08:50 +0000 |
| commit | 75fa3143079daeb0219640db9d9a365ac7e27742 (patch) | |
| tree | 250cad395ebb2d4c05e74e660b47afdc89934d86 | |
| parent | 7a0cc4af4baff5aaa3a82de75c31b8a33e4144fb (diff) | |
| download | chromium_src-75fa3143079daeb0219640db9d9a365ac7e27742.zip chromium_src-75fa3143079daeb0219640db9d9a365ac7e27742.tar.gz chromium_src-75fa3143079daeb0219640db9d9a365ac7e27742.tar.bz2 | |
Add missing dependencies on mojo_system_placeholder.
These targets use headers from mojo_system and thus need to obtain the settings
that the mojo_system target passes on to its direct dependents. As they cannot
depend on mojo_system or mojo_system_impl, they instead are made to depend on
mojo_system_placeholder, which is currently empty but will in
the near future have settings to pass on to its direct dependents.
R=jamesr@chromium.org, ncbray@chromium.org, teravest@chromium.org
Review URL: https://codereview.chromium.org/840543004
Cr-Commit-Position: refs/heads/master@{#310463}
| -rw-r--r-- | mojo/mojo_nacl.gyp | 6 | ||||
| -rw-r--r-- | mojo/mojo_nacl_untrusted.gyp | 1 | ||||
| -rw-r--r-- | ppapi/ppapi_tests_mojo.gyp | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/mojo/mojo_nacl.gyp b/mojo/mojo_nacl.gyp index f2bf74a..d7ffe19 100644 --- a/mojo/mojo_nacl.gyp +++ b/mojo/mojo_nacl.gyp @@ -49,6 +49,9 @@ 'sources': [ '<(monacl_codegen_dir)/mojo_syscall.cc', ], + 'dependencies': [ + 'mojo_public.gyp:mojo_system_placeholder', + ], }, { 'target_name': 'monacl_sel', @@ -96,6 +99,9 @@ 'sources': [ '<(monacl_codegen_dir)/mojo_syscall.cc', ], + 'dependencies': [ + 'mojo_public.gyp:mojo_system_placeholder', + ], 'configurations': { 'Common_Base': { 'msvs_target_platform': 'x64', diff --git a/mojo/mojo_nacl_untrusted.gyp b/mojo/mojo_nacl_untrusted.gyp index 4e7aab8..0cb4948 100644 --- a/mojo/mojo_nacl_untrusted.gyp +++ b/mojo/mojo_nacl_untrusted.gyp @@ -31,6 +31,7 @@ ], 'dependencies': [ 'mojo_nacl.gyp:monacl_codegen', + 'mojo_public.gyp:mojo_system_placeholder', ], }, { diff --git a/ppapi/ppapi_tests_mojo.gyp b/ppapi/ppapi_tests_mojo.gyp index a7ec351..63a3e3a 100644 --- a/ppapi/ppapi_tests_mojo.gyp +++ b/ppapi/ppapi_tests_mojo.gyp @@ -41,6 +41,7 @@ 'dependencies': [ '../mojo/mojo_nacl_untrusted.gyp:libmojo', '../mojo/mojo_nacl.gyp:monacl_codegen', + '../mojo/mojo_public.gyp:mojo_system_placeholder', '../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 'native_client/native_client.gyp:ppapi_lib', 'ppapi_nacl.gyp:ppapi_cpp_lib', |