Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

skia/BUILD.gn

 # Copyright (c) 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
 }
@@ skipping 415 matching lines @@
       "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
       "//third_party/skia/src/ports/SkScalerContext_win_dw.h",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
       "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
       "//third_party/skia/src/ports/SkTypeface_win_dw.h",
     ]
   }
   if (!is_android) {
     sources -= [
-      "//third_party/skia/src/ports/SkFontConfigParser_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",
     ]
   }
   if (!is_mac && !is_ios) {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
   if (!is_linux) {
     sources -= [
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
@@ skipping 200 matching lines @@
     sources = [
       "tools/filter_fuzz_stub/filter_fuzz_stub.cc",
     ]
 
     deps = [
       ":skia",
       "//base",
     ]
   }
 }