commit 404816ee3ff32a9f0a4fb50329321647cee4b1a5
author benjaminwagner <benjaminwagner@google.com> Thu Dec 03 05:04:03 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Dec 03 05:04:03 2015 -0800
tree 3adf75b17b167ab62086547e10c560bab79cae31
parent 7850eb2f357c215b2e2c50bf16d6c6df38c7967f

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

diff --git a/BUILD.public b/BUILD.public
index 124714e..d20eb23 100644
--- a/BUILD.public
+++ b/BUILD.public
@@ -97,6 +97,7 @@
         "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",