Split SkFontConfigInterface globals and factory.

cmake/CMakeLists.txt

 # Boilerplate.
 cmake_minimum_required (VERSION 3.1)   # First version with CMAKE_CXX_STANDARD.
 project (skimake)
 set (CMAKE_CXX_STANDARD 11)
 
 # Default to Release mode.  We're mainly targeting Skia users, not Skia developers.
 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Release)
 endif ()
 
@@ skipping 33 matching lines @@
 
 function (remove_srcs)
     file (GLOB_RECURSE to_remove ${ARGN})
     list (REMOVE_ITEM srcs ${to_remove})
     set (srcs ${srcs} PARENT_SCOPE)
 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
              ../src/ports/SkFontMgr_FontConfigInterface.cpp
              ../src/ports/SkFontMgr_FontConfigInterface_factory.cpp)
 # Alternative font managers.
 remove_srcs (../src/ports/SkFontMgr_custom*.cpp)
 # skslc main()
 remove_srcs (../src/sksl/SkSLMain.cpp)
 
@@ skipping 291 matching lines @@
         file (APPEND ${skia_h_path} "#include \"${filename_component}\"\n")
       endif ()
     endforeach()
   endif()
 endforeach()
 file(APPEND ${skia_h_path} "\n#endif  // skia_DEFINED\n")
 
 # Now build a simple example app that uses Skia via libskia.so.
 add_executable(example example.cpp)
 target_link_libraries(example skia ${OPENGL_LIBRARIES})