[Android] Stop using skia globals for font overriding in layout tests.

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("//build/config/sanitizers/sanitizers.gni")
 import("//printing/features/features.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
@@ skipping 179 matching lines @@
     # Chrome sources.
     "config/SkUserConfig.h",
     "config/sk_ref_cnt_ext_debug.h",
     "config/sk_ref_cnt_ext_release.h",
     "ext/SkDiscardableMemory_chrome.cc",
     "ext/SkMemory_new_handler.cpp",
     "ext/analysis_canvas.cc",
     "ext/benchmarking_canvas.cc",
     "ext/convolver.cc",
     "ext/event_tracer_impl.cc",
+    "ext/fontmgr_default_android.cc",
     "ext/fontmgr_default_linux.cc",
     "ext/fontmgr_default_win.cc",
     "ext/google_logging.cc",
     "ext/image_operations.cc",
     "ext/opacity_filter_canvas.cc",
     "ext/platform_device.cc",
     "ext/platform_device_linux.cc",
     "ext/platform_device_mac.cc",
     "ext/platform_device_win.cc",
     "ext/recursive_gaussian_convolution.cc",
@@ skipping 26 matching lines @@
     "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
     "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
     "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
     "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
     "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
     "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
     "//third_party/skia/src/ports/SkFontHost_mac.cpp",
     "//third_party/skia/src/ports/SkFontHost_win.cpp",
     "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.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_default.cpp",
     "//third_party/skia/src/ports/SkImageEncoder_none.cpp",
     "//third_party/skia/src/ports/SkImageGenerator_none.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/SkRemotableFontMgr_win_dw.cpp",
     "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
@@ skipping 74 matching lines @@
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_win.cpp",
       "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
       "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
       "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
     ]
   }
-  if (!is_android) {
-    sources -= [
-      "//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) {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
   if (!is_linux) {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
       "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",
     ]
   }
 
-  # Add the files for the SkFontMgr_Android. This is used to emulate android
-  # fonts on linux. See content/zygote/zygote_main_linux.cc
-  if (is_linux) {
-    sources += [
-      "//third_party/skia/src/ports/SkFontMgr_android.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
-    ]
-  }
-
   if (!is_linux && !is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+
+      # Retain the files for the SkFontMgr_Android on linux to emulate android
+      # fonts. See content/zygote/zygote_main_linux.cc
+      "//third_party/skia/src/ports/SkFontMgr_android.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     ]
   }
 
   # Select the right BitmapPlatformDevice.
   if (is_win) {
     sources += [ "ext/bitmap_platform_device_win.cc" ]
   } else if (is_mac) {
     sources += [ "ext/bitmap_platform_device_mac.cc" ]
   } else if (use_cairo) {
     sources += [ "ext/bitmap_platform_device_cairo.cc" ]
@@ skipping 332 matching lines @@
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }