diff options
| author | blundell <blundell@chromium.org> | 2015-01-07 02:36:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 10:37:38 +0000 |
| commit | 43b2f51fdb81ede0dba29d9c23f7747af608a291 (patch) | |
| tree | aab4afeec9616ea98f84896b5510153a29bf410e /mojo/mojo_variables.gypi | |
| parent | 47a93b8dfc17ac9d2fc7d6a2886a571dce2539c7 (diff) | |
| download | chromium_src-43b2f51fdb81ede0dba29d9c23f7747af608a291.zip chromium_src-43b2f51fdb81ede0dba29d9c23f7747af608a291.tar.gz chromium_src-43b2f51fdb81ede0dba29d9c23f7747af608a291.tar.bz2 | |
Change the non-component definition of mojo_system_for_component
In non-component builds, targets that depend on <(mojo_system_for_component)
still need to obtain the settings that mojo_system passes to its direct
dependents. This patch allows for that by changing the definition of
mojo_system_for_component in the non-component case to a
mojo_system_placeholder target whose explicit purpose is only to pass on the
right direct_dependent_settings. Note that currently mojo_system_placeholder
has no such settings to pass on; that will shortly change when the location of
the Mojo SDK in Chromium changes.
Review URL: https://codereview.chromium.org/797613006
Cr-Commit-Position: refs/heads/master@{#310263}
Diffstat (limited to 'mojo/mojo_variables.gypi')
| -rw-r--r-- | mojo/mojo_variables.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/mojo_variables.gypi b/mojo/mojo_variables.gypi index 047b25a..6ec89a0 100644 --- a/mojo/mojo_variables.gypi +++ b/mojo/mojo_variables.gypi @@ -36,7 +36,7 @@ 'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl", 'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl", }, { - 'mojo_system_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none", + 'mojo_system_for_component': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system_placeholder", 'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system", 'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none", }], |