diff options
| author | jamesr <jamesr@chromium.org> | 2014-08-27 20:55:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 03:56:27 +0000 |
| commit | 66d1d784036d8b7ab4889c46d0bdb87a9a264a9f (patch) | |
| tree | d7b75b870d9a8d511baca1f20eab99ac57785fea /mojo/mojo_variables.gypi | |
| parent | c1f65d4b57000fa395d501379cd906f9ea5833e6 (diff) | |
| download | chromium_src-66d1d784036d8b7ab4889c46d0bdb87a9a264a9f.zip chromium_src-66d1d784036d8b7ab4889c46d0bdb87a9a264a9f.tar.gz chromium_src-66d1d784036d8b7ab4889c46d0bdb87a9a264a9f.tar.bz2 | |
Put thunk targets directly into loadable modules in static build
gles2_thunks.cc, gles2_impl_thunks.cc, etc define symbols that should be
exported from loadable modules. If these files are linked into a static
library and that static library is then linked into a loadable module,
the linker may or may not pull in the object files for the thunks
depending on if any symbols from that object file are referenced by
some other object file in the component.
This puts the thunks into a gypi that can be included directly into a
loadable module so the object files containing the thunks are on the
link line directly and make it into the final library.
R=erg@chromium.org
Review URL: https://codereview.chromium.org/509123003
Cr-Commit-Position: refs/heads/master@{#292315}
Diffstat (limited to 'mojo/mojo_variables.gypi')
| -rw-r--r-- | mojo/mojo_variables.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mojo/mojo_variables.gypi b/mojo/mojo_variables.gypi index ff0d1b1..ef362b7 100644 --- a/mojo/mojo_variables.gypi +++ b/mojo/mojo_variables.gypi @@ -35,12 +35,10 @@ 'mojo_system_for_component': "mojo_base.gyp:mojo_system_impl", 'mojo_system_for_loadable_module': "mojo_base.gyp:mojo_system_impl", 'mojo_gles2_for_component': "mojo_base.gyp:mojo_gles2_impl", - 'mojo_gles2_for_loadable_module': "mojo_base.gyp:mojo_gles2_impl", }, { 'mojo_system_for_component': "mojo_base.gyp:mojo_none", 'mojo_system_for_loadable_module': "mojo_base.gyp:mojo_system", 'mojo_gles2_for_component': "mojo_base.gyp:mojo_none", - 'mojo_gles2_for_loadable_module': "mojo_base.gyp:mojo_gles2", }], ], }, |