Chromium Code Reviews| Index: ui/gl/gl.gyp |
| diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp |
| index f90b2ddc02c9c7d7a930311d4821470bdf1efaf8..79757ae8a04df991f5f87a3edfa0fcd3d278b1bc 100644 |
| --- a/ui/gl/gl.gyp |
| +++ b/ui/gl/gl.gyp |
| @@ -55,6 +55,7 @@ |
| 'gl_context.h', |
| 'gl_context_android.cc', |
| 'gl_context_mac.mm', |
| + 'gl_context_ozone.cc', |
| 'gl_context_osmesa.cc', |
| 'gl_context_osmesa.h', |
| 'gl_context_stub.cc', |
| @@ -70,6 +71,7 @@ |
| 'gl_image.h', |
| 'gl_image_android.cc', |
| 'gl_image_mac.cc', |
| + 'gl_image_ozone.cc', |
| 'gl_image_stub.cc', |
| 'gl_image_stub.h', |
| 'gl_image_win.cc', |
| @@ -77,6 +79,7 @@ |
| 'gl_implementation.cc', |
| 'gl_implementation.h', |
| 'gl_implementation_android.cc', |
| + 'gl_implementation_ozone.cc', |
| 'gl_implementation_mac.cc', |
| 'gl_implementation_win.cc', |
| 'gl_implementation_x11.cc', |
| @@ -92,6 +95,7 @@ |
| 'gl_surface.h', |
| 'gl_surface_android.cc', |
| 'gl_surface_mac.cc', |
| + 'gl_surface_ozone.cc', |
| 'gl_surface_stub.cc', |
| 'gl_surface_stub.h', |
| 'gl_surface_win.cc', |
| @@ -174,7 +178,7 @@ |
| }, |
| ], |
| 'conditions': [ |
| - ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { |
| + ['OS in ("win", "android", "linux")', { |
|
rjkroege
2013/05/17 22:17:06
this looks like an error on my part. fixing.
rjkroege
2013/05/21 17:36:28
on double-checking, this change is indeed necessar
|
| 'sources': [ |
| 'egl_util.cc', |
| 'egl_util.h', |