Update To 11.40.268.0

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

diff --git a/src/skia/skia.gyp b/src/skia/skia.gyp
index c4129db..16e03a2 100644 (file)
--- a/src/skia/skia.gyp
+++ b/src/skia/skia.gyp
@@ -8,7 +8,7 @@
     # However, in the static mode, we need to build skia as multiple targets
     # in order to support the use case where a platform (e.g. Android) may
     # already have a copy of skia as a system library.
-    ['component=="static_library" and use_system_skia==0', {
+    ['component=="static_library"', {
       'targets': [
         {
           'target_name': 'skia_library',
@@ -17,18 +17,10 @@
             'skia_library.gypi',
             'skia_common.gypi',
             '../build/android/increase_size_for_speed.gypi',
-          ],
-        },
-      ],
-    }],
-    ['component=="static_library" and use_system_skia==1', {
-      'targets': [
-        {
-          'target_name': 'skia_library',
-          'type': 'none',
-          'includes': [
-            'skia_system.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',
           ],
         },
       ],