Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/BUILD.public.expected

Issue 1491943004: Fix ODR violation. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « BUILD.public ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/BUILD.public.expected
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 04edb2154523796a1259ba7d4e03e5375b9b2d85..e41605ca54c294ce67482b4887b33fa35125c098 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',
« no previous file with comments | « BUILD.public ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698