Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / gl / gl.gyp

diff --git a/src/ui/gl/gl.gyp b/src/ui/gl/gl.gyp
index 613f961..d698dbc 100644 (file)
--- a/src/ui/gl/gl.gyp
+++ b/src/ui/gl/gl.gyp
@@ -49,8 +49,6 @@
         'android/surface_texture.h',
         'android/surface_texture_listener.cc',
         'android/surface_texture_listener.h',
-        'android/surface_texture_tracker.cc',
-        'android/surface_texture_tracker.h',
         'gl_bindings.h',
         'gl_bindings_skia_in_process.cc',
         'gl_bindings_skia_in_process.h',
@@ -76,7 +74,6 @@
         'gl_fence_nv.h',
         'gl_gl_api_implementation.cc',
         'gl_gl_api_implementation.h',
-        'gl_image.cc',
         'gl_image.h',
         'gl_image_memory.cc',
         'gl_image_memory.h',
@@ -116,6 +113,7 @@
         'gl_version_info.h',
         'gpu_switching_manager.cc',
         'gpu_switching_manager.h',
+        'gpu_switching_observer.h',
         'scoped_binders.cc',
         'scoped_binders.h',
         'scoped_make_current.cc',
@@ -200,14 +198,18 @@
             'gl_implementation_osmesa.h',
           ],
         }],
+        ['OS=="linux"', {
+          'sources': [
+            'gl_image_linux_dma_buffer.cc',
+            'gl_image_linux_dma_buffer.h',
+          ],
+        }],
         ['use_x11 == 1', {
           'sources': [
             'gl_context_glx.cc',
             'gl_context_glx.h',
             'gl_glx_api_implementation.cc',
             'gl_glx_api_implementation.h',
-            'gl_image_glx.cc',
-            'gl_image_glx.h',
             'gl_surface_glx.cc',
             'gl_surface_glx.h',
             'gl_egl_api_implementation.cc',
@@ -278,8 +280,6 @@
             'gl_jni_headers',
           ],
           'sources': [
-            'gl_image_android_native_buffer.cc',
-            'gl_image_android_native_buffer.h',
             'gl_image_surface_texture.cc',
             'gl_image_surface_texture.h',
           ],
@@ -309,6 +309,14 @@
             '../android/ui_android.gyp:ui_java',
           ],
         }],
+        ['ubsan==1', {
+          # Due to a bug in LLVM (http://llvm.org/bugs/show_bug.cgi?id=21349),
+          # compilation hangs for some GL source files. Disable -O2 temporarily
+          # until http://crbug.com/426271 is fixed.
+          'cflags!': [
+            '-O2',
+          ],
+        }],
       ],
     },
     {