Upstream version 9.38.198.0

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

diff --git a/src/skia/skia_chrome.gypi b/src/skia/skia_chrome.gypi
index aa6e273..1637e88 100644 (file)
--- a/src/skia/skia_chrome.gypi
+++ b/src/skia/skia_chrome.gypi
@@ -19,8 +19,15 @@
       'ext',
     ],
   },
-
+  'variables': {
+    # TODO(scottmg): http://crbug.com/177306
+    'clang_warning_flags_unset': [
+      # Don't warn about string->bool used in asserts.
+      '-Wstring-conversion',
+    ],
+  },
   'sources': [
+    # Note: file list duplicated in GN build.
     'ext/analysis_canvas.cc',
     'ext/analysis_canvas.h',
     'ext/benchmarking_canvas.cc',
@@ -36,6 +43,10 @@
     'ext/bitmap_platform_device_win.h',
     'ext/convolver.cc',
     'ext/convolver.h',
+    'ext/event_tracer_impl.cc',
+    'ext/event_tracer_impl.h',
+    'ext/fontmgr_default_win.cc',
+    'ext/fontmgr_default_win.h',
     'ext/google_logging.cc',
     'ext/image_operations.cc',
     'ext/image_operations.h',
@@ -69,7 +80,6 @@
     'ext/skia_utils_mac.h',
     'ext/skia_utils_win.cc',
     'ext/skia_utils_win.h',
-    'ext/vector_canvas.cc',
     'ext/vector_canvas.h',
     'ext/vector_platform_device_emf_win.cc',
     'ext/vector_platform_device_emf_win.h',
@@ -95,18 +105,6 @@
         'skia_chrome_opts',
       ],
     }],
-    # TODO(scottmg): http://crbug.com/177306
-    ['clang==1', {
-      'xcode_settings': {
-        'WARNING_CFLAGS!': [
-          # Don't warn about string->bool used in asserts.
-          '-Wstring-conversion',
-        ],
-      },
-      'cflags!': [
-        '-Wstring-conversion',
-      ],
-    }],
     [ 'OS != "android" and (OS != "linux" or use_cairo==1)', {
       'sources!': [
         'ext/bitmap_platform_device_skia.cc',