diff options
| author |  bungeman <bungeman@google.com> | 2016-09-19 12:13:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-19 12:13:16 -0700 |
| commit | 1ae0e01accbca4b96a10b8a8c21917dd7bf27dc3 (patch) | |
| tree | 61601c7afe04b356d2117fd2b00fd25faa01917b /cmake | |
| parent | 0262b5c1a0ab704e42d367b070a09bb83188d983 (diff) | |
Split SkFontConfigInterface globals and factory.
Chromium needs to be able to set up their build such that the globals
continue existing but the SkFontMgr::Factory can be defined separately.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2346333002
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/2346333002
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c54d430bee..0ed0957f79 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -51,7 +51,8 @@ endfunction() # This file is empty and is only used to trick GYP. remove_srcs (../src/core/SkForceCPlusPlusLinking.cpp) # Chrome only? -remove_srcs (../src/ports/SkFontConfigInterface_direct.cpp +remove_srcs (../src/ports/SkFontConfigInterface.cpp + ../src/ports/SkFontConfigInterface_direct.cpp ../src/ports/SkFontConfigInterface_direct_factory.cpp ../src/ports/SkFontConfigInterface_direct_google3.cpp ../src/ports/SkFontConfigInterface_direct_google3_factory.cpp |