diff options
| author |  benjaminwagner <benjaminwagner@google.com> | 2015-12-03 05:04:03 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-03 05:04:03 -0800 |
| commit | 404816ee3ff32a9f0a4fb50329321647cee4b1a5 (patch) | |
| tree | 3adf75b17b167ab62086547e10c560bab79cae31 /tools/BUILD.public.expected | |
| parent | 7850eb2f357c215b2e2c50bf16d6c6df38c7967f (diff) | |
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
Diffstat (limited to 'tools/BUILD.public.expected')
| -rw-r--r-- | tools/BUILD.public.expected | 2 |
1 files changed, 0 insertions, 2 deletions
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', |