Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 24 insertions, 1 deletions

diff --git a/chromium/skia/skia_common.gypi b/chromium/skia/skia_common.gypi
index 616ae5bb31b..0f5f9767241 100644
--- a/chromium/skia/skia_common.gypi
+++ b/chromium/skia/skia_common.gypi
@@ -5,12 +5,22 @@
 # This gypi file handles the removal of platform-specific files from the
 # Skia build.
 {
+  'include_dirs': [
+    '..',
+    'config',
+  ],
+
   'conditions': [
     [ 'OS != "android"', {
       'sources/': [
          ['exclude', '_android\\.(cc|cpp)$'],
       ],
     }],
+    [ 'OS == "android"', {
+      'defines': [
+        'SK_FONTHOST_DOES_NOT_USE_FONTMGR',
+      ],
+    }],
     [ 'OS != "ios"', {
       'sources/': [
          ['exclude', '_ios\\.(cc|cpp|mm?)$'],
@@ -24,10 +34,23 @@
     [ 'OS != "win"', {
       'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
     }],
-    [ 'use_glib == 0', {
+    [ 'desktop_linux == 0 and chromeos == 0', {
       'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
     }],
+    [ 'use_cairo == 0', {
+      'sources/': [ ['exclude', '_cairo\\.(cc|cpp)$'] ],
+    }],
   ],
 
+  # We would prefer this to be direct_dependent_settings,
+  # however we currently have no means to enforce that direct dependents
+  # re-export if they include Skia headers in their public headers.
+  'all_dependent_settings': {
+    'include_dirs': [
+      '..',
+      'config',
+    ],
+  },
+
   'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
 }