Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / mesa / mesa.gyp

diff --git a/src/third_party/mesa/mesa.gyp b/src/third_party/mesa/mesa.gyp
index be008d4..6ccbb2a 100644 (file)
--- a/src/third_party/mesa/mesa.gyp
+++ b/src/third_party/mesa/mesa.gyp
@@ -298,7 +298,6 @@
         'src/src/mesa/main/api_arrayelt.h',
         'src/src/mesa/main/api_exec.c',
         'src/src/mesa/main/api_exec.h',
-        '<(generated_src_dir)/mesa/api_exec_es1.c',
         'src/src/mesa/main/api_loopback.c',
         'src/src/mesa/main/api_loopback.h',
         'src/src/mesa/main/api_validate.c',
@@ -347,8 +346,6 @@
         'src/src/mesa/main/enums.h',
         'src/src/mesa/main/errors.c',
         'src/src/mesa/main/errors.h',
-        'src/src/mesa/main/es1_conversion.c',
-        'src/src/mesa/main/es1_conversion.h',
         'src/src/mesa/main/eval.c',
         'src/src/mesa/main/eval.h',
         'src/src/mesa/main/execmem.c',
@@ -414,7 +411,6 @@
         'src/src/mesa/main/points.h',
         'src/src/mesa/main/polygon.c',
         'src/src/mesa/main/polygon.h',
-        'src/src/mesa/main/querymatrix.c',
         'src/src/mesa/main/queryobj.c',
         'src/src/mesa/main/queryobj.h',
         'src/src/mesa/main/rastpos.c',
@@ -661,6 +657,14 @@
             '_GLAPI_NO_EXPORTS',
           ],
         }],
+        ['ubsan==1', {
+          # Due to a bug in LLVM (http://llvm.org/bugs/show_bug.cgi?id=21349),
+          # compilation hangs for some Mesa source files. Disable -O2
+          # temporarily until http://crbug.com/426271 is fixed.
+          'cflags!': [
+            '-O2',
+          ],
+        }],
       ],
     },
     # Building this target will hide the native OpenGL shared library and