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

Unified Diff: ui/gl/gl.gyp

Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix linux_chromium_gn_dgb build Created 5 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 | « ui/gl/BUILD.gn ('k') | ui/gl/gl_image_linux_dma_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index ae4dfa9014c57333dd6c9cca381e5300a63ef624..7221f28bf6bf573d08ddd4bc66dce919baa48ac8 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -150,12 +150,6 @@
'gl_implementation_osmesa.h',
],
}],
- ['OS=="linux"', {
- 'sources': [
- 'gl_image_linux_dma_buffer.cc',
- 'gl_image_linux_dma_buffer.h',
- ],
- }],
['use_x11 == 1', {
'sources': [
'gl_bindings_autogen_glx.cc',
@@ -264,6 +258,10 @@
'sources/': [ ['exclude', '^android/'] ],
}],
['use_ozone==1', {
+ 'sources': [
+ 'gl_image_ozone_native_pixmap.cc',
+ 'gl_image_ozone_native_pixmap.h',
+ ],
'dependencies': [
'../ozone/ozone.gyp:ozone',
'../ozone/ozone.gyp:ozone_base',
« no previous file with comments | « ui/gl/BUILD.gn ('k') | ui/gl/gl_image_linux_dma_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698