Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: mojo/mojo_public.gypi

Issue 425193002: Revert of mojo: Convert gles2 to the new thunking system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 5ec7020778a08b3cdae87e7013cd971b056d81e3..a728bdc75a4a225534fa4ab4929369767b97bbd3 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -41,46 +41,6 @@
'public/c/system/types.h',
'public/platform/native/system_thunks.cc',
'public/platform/native/system_thunks.h',
- ],
- },
- {
- # GN version: //mojo/public/gles2
- 'target_name': 'mojo_gles2',
- 'type': 'static_library',
- 'defines': [
- 'MOJO_GLES2_IMPLEMENTATION',
- 'GLES2_USE_MOJO',
- ],
- 'include_dirs': [
- '..',
- ],
- 'dependencies': [
- '../third_party/khronos/khronos.gyp:khronos_headers'
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- 'defines': [
- 'GLES2_USE_MOJO',
- ],
- },
- 'all_dependent_settings': {
- 'conditions': [
- # We need to be able to call the MojoSetGLES2Thunks() function in
- # gles2_thunks.cc
- ['OS=="android"', {
- 'ldflags!': [
- '-Wl,--exclude-libs=ALL',
- ],
- }],
- ],
- },
- 'sources': [
- 'public/c/gles2/gles2.h',
- 'public/c/gles2/gles2_export.h',
- 'public/platform/native/gles2_thunks.cc',
- 'public/platform/native/gles2_thunks.h',
],
},
{
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698