Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / skia / skia_library.gypi

diff --git a/src/skia/skia_library.gypi b/src/skia/skia_library.gypi
index 05f1933..fe1793f 100644 (file)
--- a/src/skia/skia_library.gypi
+++ b/src/skia/skia_library.gypi
@@ -21,6 +21,7 @@
     '../third_party/skia/gyp/core.gypi',
     '../third_party/skia/gyp/effects.gypi',
     '../third_party/skia/gyp/pdf.gypi',
+    '../third_party/skia/gyp/record.gypi',
   ],
 
   'sources': [
@@ -32,9 +33,7 @@
     '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.h',
 
-    '../third_party/skia/src/opts/opts_check_SSE2.cpp',
-
-    '../third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp',
+    '../third_party/skia/src/opts/opts_check_x86.cpp',
 
     '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp',
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
@@ -86,6 +85,8 @@
     '../third_party/skia/src/utils/SkCanvasStateUtils.cpp',
     '../third_party/skia/src/utils/SkEventTracer.cpp',
     '../third_party/skia/src/utils/SkDeferredCanvas.cpp',
+    '../third_party/skia/src/utils/SkMatrix22.cpp',
+    '../third_party/skia/src/utils/SkMatrix22.h',
     '../third_party/skia/src/utils/SkMatrix44.cpp',
     '../third_party/skia/src/utils/SkNullCanvas.cpp',
     '../third_party/skia/include/utils/SkNWayCanvas.h',
@@ -127,6 +128,7 @@
     '../third_party/skia/include/pdf',
     '../third_party/skia/include/pipe',
     '../third_party/skia/include/ports',
+    '../third_party/skia/include/record',
     '../third_party/skia/include/utils',
     '../third_party/skia/src/core',
     '../third_party/skia/src/opts',
@@ -185,7 +187,7 @@
     [ 'target_arch == "arm" or target_arch == "arm64" or \
        target_arch == "mipsel"', {
       'sources!': [
-        '../third_party/skia/src/opts/opts_check_SSE2.cpp'
+        '../third_party/skia/src/opts/opts_check_x86.cpp'
       ],
     }],
     [ 'desktop_linux == 1 or chromeos == 1', {
@@ -247,7 +249,7 @@
         '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
       ],
       'sources/': [
-        ['exclude', 'opts_check_SSE2\\.cpp$'],
+        ['exclude', 'opts_check_x86\\.cpp$'],
       ],
 
       # The main skia_opts target does not currently work on iOS because the