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

Unified Diff: mojo/mojo_public.gypi

Issue 460743002: mojo: Reland "Convert gles2 to the new thunking system." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use the mojo_gles2_for_loadable_module variable in more places. Created 6 years, 4 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 1897f6d731065b3c202814d5c73e39377ee00005..20af45f33e00bdb5b1d5a2e5cb78d0fa86c37d21 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -44,6 +44,46 @@
],
},
{
+ # 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',
+ ],
+ },
+ {
# GN version: //mojo/public/cpp/bindings
'target_name': 'mojo_cpp_bindings',
'type': 'static_library',
« 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