From 404816ee3ff32a9f0a4fb50329321647cee4b1a5 Mon Sep 17 00:00:00 2001 From: benjaminwagner Date: Thu, 3 Dec 2015 05:04:03 -0800 Subject: [PATCH] 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 --- BUILD.public | 1 + tools/BUILD.public.expected | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/BUILD.public b/BUILD.public index 124714ece9..d20eb235ee 100644 --- 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 04edb21545..e41605ca54 100644 --- 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',