Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / skia / skia_library_opts.gyp

diff --git a/src/skia/skia_library_opts.gyp b/src/skia/skia_library_opts.gyp
index 5413721..6673105 100644 (file)
--- a/src/skia/skia_library_opts.gyp
+++ b/src/skia/skia_library_opts.gyp
@@ -30,6 +30,10 @@
       'includes': [
         'skia_common.gypi',
         '../build/android/increase_size_for_speed.gypi',
+        # Disable LTO due to compiler error
+        # in mems_in_disjoint_alias_sets_p, at alias.c:393
+        # crbug.com/422255
+        '../build/android/disable_lto.gypi',
       ],
       'include_dirs': [
         '../third_party/skia/include/core',
@@ -298,6 +302,9 @@
           'includes': [
             'skia_common.gypi',
             '../build/android/increase_size_for_speed.gypi',
+            # Disable LTO due to Neon issues
+            # crbug.com/408997
+            '../build/android/disable_lto.gypi',
           ],
           'include_dirs': [
             '../third_party/skia/include/core',