AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ODR violation.

Browse Source 
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
This commit is contained in:
benjaminwagner 2015-12-03 05:04:03 -08:00 committed by Commit bot
parent 7850eb2f35
commit 404816ee3f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.public
View File

@ -97,6 +97,7 @@ BASE_SRCS_UNIX = glob(
"src/ports/SkFontMgr_custom_directory_factory.cpp", "src/ports/SkFontMgr_custom_directory_factory.cpp",
"src/ports/SkFontMgr_custom_embedded_factory.cpp", "src/ports/SkFontMgr_custom_embedded_factory.cpp",
"src/ports/SkFontMgr_empty_factory.cpp", "src/ports/SkFontMgr_empty_factory.cpp",
"src/ports/SkFontMgr_fontconfig.cpp",
"src/ports/SkImageDecoder_CG.cpp", "src/ports/SkImageDecoder_CG.cpp",
"src/ports/SkFontMgr_fontconfig_factory.cpp", "src/ports/SkFontMgr_fontconfig_factory.cpp",
"src/ports/SkImageDecoder_WIC.cpp", "src/ports/SkImageDecoder_WIC.cpp",

2
tools/BUILD.public.expected
View File

@ -1492,7 +1492,6 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***',
'src/ports/SkFontHost_FreeType_common.h', 'src/ports/SkFontHost_FreeType_common.h',
'src/ports/SkFontHost_fontconfig.cpp', 'src/ports/SkFontHost_fontconfig.cpp',
'src/ports/SkFontMgr_custom.cpp', 'src/ports/SkFontMgr_custom.cpp',
'src/ports/SkFontMgr_fontconfig.cpp',
'src/ports/SkGlobalInitialization_default.cpp', 'src/ports/SkGlobalInitialization_default.cpp',
'src/ports/SkImageGenerator_skia.cpp', 'src/ports/SkImageGenerator_skia.cpp',
'src/ports/SkMemory_malloc.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_FreeType_common.h',
'src/ports/SkFontHost_fontconfig.cpp', 'src/ports/SkFontHost_fontconfig.cpp',
'src/ports/SkFontMgr_custom.cpp', 'src/ports/SkFontMgr_custom.cpp',
'src/ports/SkFontMgr_fontconfig.cpp',
'src/ports/SkGlobalInitialization_default.cpp', 'src/ports/SkGlobalInitialization_default.cpp',
'src/ports/SkImageGenerator_skia.cpp', 'src/ports/SkImageGenerator_skia.cpp',
'src/ports/SkMemory_malloc.cpp', 'src/ports/SkMemory_malloc.cpp',