diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-09 08:24:33 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-09 08:25:46 +0000 |
| commit | d475f1e614c5952b2c470ab8c148debfd8dcb6a0 (patch) | |
| tree | 219d48140f72c06ff2c09336ab5a87edbd75c042 /mojo/mojo_variables.gypi | |
| parent | 13bbbd605e745ebcfcbbe8873ef7b46dfdc3b510 (diff) | |
| download | chromium_src-d475f1e614c5952b2c470ab8c148debfd8dcb6a0.zip chromium_src-d475f1e614c5952b2c470ab8c148debfd8dcb6a0.tar.gz chromium_src-d475f1e614c5952b2c470ab8c148debfd8dcb6a0.tar.bz2 | |
Revert 288527 "mojo: Reland "Convert gles2 to the new thunking s..."
Still breaks linux bots:
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/15297
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/48234
http://build.chromium.org/p/chromium.linux/builders/Linux%20Clang%20%28dbg%29/builds/63188
> mojo: Reland "Convert gles2 to the new thunking system."
>
> This apparently fixes the tests. There was a merge conflict with the new
> mojo_base.gyp file, and now we should be properly integrated, and
> everything needed for the implementation of GLES2 should live in
> mojo_base (mirroring mojo_system_impl), while everything about the
> thunking goes in mojo_public (mirroring mojo_system).
>
> BUG=386799
> First Review URL: https://codereview.chromium.org/413303002
>
> Review URL: https://codereview.chromium.org/448873002
TBR=erg@chromium.org
Review URL: https://codereview.chromium.org/458683002
Cr-Commit-Position: refs/heads/master@{#288538}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_variables.gypi')
| -rw-r--r-- | mojo/mojo_variables.gypi | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mojo/mojo_variables.gypi b/mojo/mojo_variables.gypi index ff0d1b1..8969220 100644 --- a/mojo/mojo_variables.gypi +++ b/mojo/mojo_variables.gypi @@ -34,13 +34,9 @@ ['component=="shared_library"', { '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", }], ], }, |