Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

skia/skia_library.gypi

 # Copyright 2013 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.
 
 
 # This gypi file contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ skipping 28 matching lines @@
 
     '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp',
     '../third_party/skia/src/fonts/SkRemotableFontMgr.cpp',
     '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp',
 
     '../third_party/skia/src/ports/SkImageGenerator_none.cpp',
 
     '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
     '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
     '../third_party/skia/src/ports/SkFontHost_FreeType_common.h',
-    '../third_party/skia/src/ports/SkFontConfigParser_android.cpp',
     '../third_party/skia/src/ports/SkFontHost_mac.cpp',
     '../third_party/skia/src/ports/SkFontHost_win.cpp',
-    "../third_party/skia/src/ports/SkFontMgr_android.cpp",
+    '../third_party/skia/src/ports/SkFontMgr_android.cpp',
+    '../third_party/skia/src/ports/SkFontMgr_android_factory.cpp',
+    '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp',
     '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp',
     '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp',
     '../third_party/skia/src/ports/SkOSFile_posix.cpp',
     '../third_party/skia/src/ports/SkOSFile_stdio.cpp',
     '../third_party/skia/src/ports/SkOSFile_win.cpp',
     '../third_party/skia/src/ports/SkScalerContext_win_dw.cpp',
     '../third_party/skia/src/ports/SkScalerContext_win_dw.h',
     '../third_party/skia/src/ports/SkTime_Unix.cpp',
     '../third_party/skia/src/ports/SkTLS_pthread.cpp',
     '../third_party/skia/src/ports/SkTLS_win.cpp',
@@ skipping 185 matching lines @@
       'dependencies': [
         '../third_party/expat/expat.gyp:expat',
         '../third_party/freetype/freetype.gyp:ft2',
       ],
       # 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',
       ],
+    }, { # not 'OS == "android"'
+      'sources!': [
+        "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
+        '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp',
+      ],
     }],
     [ 'OS == "ios"', {
       'include_dirs': [
         '../third_party/skia/include/utils/ios',
         '../third_party/skia/include/utils/mac',
       ],
       'link_settings': {
         'libraries': [
           '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
         ],
@@ skipping 90 matching lines @@
       '../third_party/skia/include/pdf',
       '../third_party/skia/include/gpu',
       '../third_party/skia/include/lazy',
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
   },
 }