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

Unified Diff: mojo/mojo_services.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_public.gypi ('k') | mojo/public/c/gles2/gles2_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 3807bd95f17819e73735a80a043221abd314c377..5572beb93136d01d83d6882deeb0b3d5f887b134 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -195,6 +195,43 @@
],
},
{
+ # GN version: //mojo/public/gles2
+ 'target_name': 'mojo_gles2',
+ 'type': 'shared_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',
+ ],
+ },
+ 'sources': [
+ 'public/c/gles2/gles2.h',
+ 'public/c/gles2/gles2_export.h',
+ 'public/gles2/gles2_private.cc',
+ 'public/gles2/gles2_private.h',
+ ],
+ 'conditions': [
+ ['OS=="mac"', {
+ 'xcode_settings': {
+ # Make it a run-path dependent library.
+ 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+ },
+ }],
+ ],
+ },
+ {
# GN version: //mojo/services/gles2:interfaces (for files generated from
# the mojom file)
# GN version: //mojo/services/gles2:bindings
@@ -673,12 +710,12 @@
'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
+ 'mojo_gles2',
'mojo_input_events_bindings',
'mojo_input_events_lib',
'mojo_native_viewport_bindings',
'mojo_view_manager_bindings',
'mojo_view_manager_common',
- '<(mojo_gles2_for_component)',
'<(mojo_system_for_component)',
],
'sources': [
« no previous file with comments | « mojo/mojo_public.gypi ('k') | mojo/public/c/gles2/gles2_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698