Upstream the rest of skia diff

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 796 matching lines @@
         '../third_party/skia/src/sfnt',
         '../third_party/skia/src/utils',
       ],
       'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800],
       'defines': [
         'SK_BUILD_NO_IMAGE_ENCODE',
         'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         '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
         'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
 
         # skia uses static initializers to initialize the serialization logic
         # of its "pictures" library. This is currently not used in chrome; if
         # it ever gets used the processes that use it need to call
         # SkGraphics::Init().
         'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
 
         # Temporarily disable the Skia fix in
         # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that
         # 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!': [
         '../third_party/skia/include/core/SkTypes.h',
       ],
       'conditions': [
         ['order_profiling != 0', {
           'target_conditions' : [
             ['_toolset=="target"', {
               'cflags!': [ '-finstrument-functions' ],
             }],
           ],
         }],
         # For POSIX platforms, prefer the Mutex implementation provided by Skia
         # since it does not generate static initializers.
         [ 'OS == "android" or OS == "linux" or OS == "mac"', {
           'defines+': [
             'SK_USE_POSIX_THREADS',
           ],
           'sources!': [
             'ext/SkThread_chrome.cc',
           ],
         }],
         [ 'OS != "android"', {
           'sources/': [
             ['exclude', '_android\\.(cc|cpp)$'],
+            # Below files are only used by Android
+            ['exclude', '../third_party/skia/src/ports/SkFontHost_gamma\\.cpp$'],
           ],
-          'sources!': [
-            # Below files are only used by Android
-            '../third_party/skia/src/ports/SkFontHost_gamma.cpp',
+          'defines': [
+            'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
           ],
         }],
         [ 'OS != "mac"', {
           'sources/': [
             ['exclude', '_mac\\.(cc|cpp|mm?)$'],
             ['exclude', '/mac/']
           ],
         }],
         [ 'OS != "win"', {
           'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
@@ skipping 34 matching lines @@
           ],
         }],
         [ 'use_glib == 0 and OS != "android"', {
           'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
           'sources!': [
             '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
             '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp',
             '../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$'],
             ['exclude', 'ext/platform_canvas_linux\\.cc$'],
             ['exclude', 'ext/platform_canvas_win\\.cc$'],
           ],
         }, { # use_aura == 0 and use_canvas_skia == 1
           'sources/': [ ['exclude', 'ext/platform_canvas_skia\\.cc$'] ],
         }],
         [ 'toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gdk',
           ],
         }, {  # toolkit_uses_gtk == 0
           '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!': [
                 # Android doesn't use Skia's PDF generation, which is what uses
                 # sfntly.
                 '../third_party/sfntly/sfntly.gyp:sfntly',
               ],
               # This exports a hard dependency because it needs to run its
               # symlink action in order to expose the skia header files.
               'hard_dependency': 1,
               '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',
                 '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
               ],
               'export_dependent_settings': [
                 '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
               ],
             }],
             [ '_toolset == "target" and android_build_type == 0', {
@@ skipping 102 matching lines @@
           'SK_BUILD_NO_IMAGE_ENCODE',
           'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
           'GR_AGGRESSIVE_SHADER_OPTS=1',
         ],
         'conditions': [
           ['OS=="android"', {
             'dependencies!': [
               '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',
                 ],
               }],
             ],
           }],
           ['OS=="mac"', {
             'include_dirs': [
               '../third_party/skia/include/utils/mac',
@@ skipping 196 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }