Fix ODR violation.

src/ports/SkFontMgr_fontconfig.cpp and src/fonts/SkFontMgr_fontconfig.cpp both define SkFontMgr_fontconfig.

BUG=skia:
TBR=bungeman

Review URL: https://codereview.chromium.org/1491943004

diff --git a/BUILD.public b/BUILD.public
index 124714e..d20eb23 100644 (file)
--- a/BUILD.public
+++ b/BUILD.public
@@ -97,6 +97,7 @@ BASE_SRCS_UNIX = glob(
         "src/ports/SkFontMgr_custom_directory_factory.cpp",
         "src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_empty_factory.cpp",
+        "src/ports/SkFontMgr_fontconfig.cpp",
         "src/ports/SkImageDecoder_CG.cpp",
         "src/ports/SkFontMgr_fontconfig_factory.cpp",
         "src/ports/SkImageDecoder_WIC.cpp",

diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 04edb21..e41605c 100644 (file)
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -1492,7 +1492,6 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***',
  'src/ports/SkFontHost_FreeType_common.h',
  'src/ports/SkFontHost_fontconfig.cpp',
  'src/ports/SkFontMgr_custom.cpp',
- 'src/ports/SkFontMgr_fontconfig.cpp',
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
@@ -1595,7 +1594,6 @@ BASE_SRCS_UNIX = ['src/fonts/SkFontMgr_fontconfig.cpp',
  'src/ports/SkFontHost_FreeType_common.h',
  'src/ports/SkFontHost_fontconfig.cpp',
  'src/ports/SkFontMgr_custom.cpp',
- 'src/ports/SkFontMgr_fontconfig.cpp',
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',