Upstream the rest of skia diff

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 8a9ee58681fd28e7823a7da59c26ce728e834102..75ffdc6a3eb82190e4fce3892541bf2d4b06e2ce 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -814,7 +814,6 @@
         'GR_STATIC_RECT_VB=1',
         'GR_AGGRESSIVE_SHADER_OPTS=1',
         'SK_DISABLE_FAST_AA_STROKE_RECT',
-        'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
         'SK_DEFERRED_CANVAS_USES_GPIPE=1',
 
         # temporary for landing Skia rev 3077 with minimal layout test breakage
@@ -831,7 +830,7 @@
         # fix will require substantial rebaselining.
         'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX',
 
-        # Temporarily ignore fix to antialias coverage, until we can rebaseline	 
+        # Temporarily ignore fix to antialias coverage, until we can rebaseline
         'SK_USE_LEGACY_AA_COVERAGE',
       ],
       'sources!': [
@@ -858,10 +857,11 @@
         [ 'OS != "android"', {
           'sources/': [
             ['exclude', '_android\\.(cc|cpp)$'],
-          ],
-          'sources!': [
             # Below files are only used by Android
-            '../third_party/skia/src/ports/SkFontHost_gamma.cpp',
+            ['exclude', '../third_party/skia/src/ports/SkFontHost_gamma\\.cpp$'],
+          ],
+          'defines': [
+            'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
           ],
         }],
         [ 'OS != "mac"', {
@@ -916,13 +916,6 @@
             '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
           ],
         }],
-        [ 'OS == "android"', {
-          'sources/': [
-            ['exclude', '_linux\\.(cc|cpp)$'],
-            ['include', 'ext/platform_device_linux\\.cc$'],
-            ['include', 'ext/platform_canvas_linux\\.cc$'],
-          ],
-        }],
         [ 'use_aura == 1 and use_canvas_skia == 1', {
           'sources/': [
             ['exclude', 'ext/platform_canvas_mac\\.cc$'],
@@ -940,20 +933,24 @@
           'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ],
         }],
         [ 'OS == "android"', {
-          'defines': [
-            'SK_BUILD_FOR_ANDROID_NDK',
+          'sources/': [
+            ['exclude', '_linux\\.(cc|cpp)$'],
           ],
           'conditions': [
             [ '_toolset == "target"', {
               'defines': [
                 'HAVE_PTHREADS',
                 'OS_ANDROID',
+                'SK_BUILD_FOR_ANDROID_NDK',
+                # Android devices are typically more memory constrained, so
+                # use a smaller glyph cache.
+                'SK_DEFAULT_FONT_CACHE_LIMIT=(8*1024*1024)',
                 'USE_CHROMIUM_SKIA',
               ],
               'dependencies': [
+                '../third_party/expat/expat.gyp:expat',
                 '../third_party/freetype/freetype.gyp:ft2',
                 '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
-                '../third_party/expat/expat.gyp:expat',
                 'skia_opts'
               ],
               'dependencies!': [
@@ -967,6 +964,10 @@
               'include_dirs': [
                 '../third_party/expat/files/lib',
               ],
+              'sources/': [
+                ['include', 'ext/platform_device_linux\\.cc$'],
+                ['include', 'ext/platform_canvas_linux\\.cc$'],
+              ],
               'sources!': [
                 'ext/vector_platform_device_skia.cc',
                 '../third_party/skia/src/pdf/SkPDFFont.cpp',
@@ -1089,23 +1090,11 @@
               'skia_opts',
               '../third_party/zlib/zlib.gyp:zlib',
             ],
+            'defines': [
+              # Don't use non-NDK available stuff.
+              'SK_BUILD_FOR_ANDROID_NDK',
+            ],
             'conditions': [
-              ['use_system_skia==1', {
-                'defines': [
-                  'SK_RELEASE',  # Assume platform has a release build.
-                ],
-                'include_dirs!': [
-                  'config',  # Avoid including Chromium skia config.
-                ],
-                'libraries': [
-                  '-lskia',
-                ],
-              }, {  # !use_system_skia
-                'defines': [
-                  # Don't use non-NDK available stuff.
-                  'SK_BUILD_FOR_ANDROID_NDK',
-                 ],
-              }],
               [ '_toolset == "target" and android_build_type == 0', {
                 'defines': [
                   'HAVE_ENDIAN_H',