diff options
| -rw-r--r-- | cmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | public.bzl | 4 | ||||
| -rw-r--r-- | src/fonts/SkFontMgr_fontconfig.cpp | 8 | ||||
| -rw-r--r-- | src/ports/SkFontHost_fontconfig.cpp | 8 |
4 files changed, 1 insertions, 23 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 255b3c1fc1..b18510ebd4 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -51,9 +51,7 @@ endfunction() # This file is empty and is only used to trick GYP. remove_srcs (../src/core/SkForceCPlusPlusLinking.cpp) # Chrome only? -remove_srcs (../src/ports/SkFontHost_fontconfig.cpp - ../src/fonts/SkFontMgr_fontconfig.cpp - ../src/ports/SkFontConfigInterface_direct.cpp +remove_srcs (../src/ports/SkFontConfigInterface_direct.cpp ../src/ports/SkFontConfigInterface_direct_factory.cpp ../src/ports/SkFontConfigInterface_direct_google3.cpp ../src/ports/SkFontConfigInterface_direct_google3_factory.cpp diff --git a/public.bzl b/public.bzl index d332bfe574..cc83dcf401 100644 --- a/public.bzl +++ b/public.bzl @@ -120,7 +120,6 @@ BASE_SRCS_ALL = struct( "src/gpu/gl/GrGLCreateNativeInterface_none.cpp", "src/gpu/gl/GrGLDefaultInterface_native.cpp", "src/gpu/gl/GrGLDefaultInterface_none.cpp", - "src/fonts/SkFontMgr_fontconfig.cpp", # Exclude files that don't compile with the current DEFINES. "src/gpu/gl/mesa/*", # Requires SK_MESA define. @@ -176,7 +175,6 @@ BASE_SRCS_UNIX = struct( "src/ports/*nacl*", "src/ports/*win*", "src/ports/SkFontConfigInterface_direct_factory.cpp", - "src/ports/SkFontHost_fontconfig.cpp", "src/ports/SkFontMgr_custom_directory_factory.cpp", "src/ports/SkFontMgr_custom_embedded_factory.cpp", "src/ports/SkFontMgr_custom_empty_factory.cpp", @@ -224,7 +222,6 @@ BASE_SRCS_ANDROID = struct( "src/ports/*nacl*", "src/ports/*win*", "src/ports/SkDebug_stdio.cpp", - "src/ports/SkFontHost_fontconfig.cpp", "src/ports/SkFontMgr_custom_directory_factory.cpp", "src/ports/SkFontMgr_custom_embedded_factory.cpp", "src/ports/SkFontMgr_custom_empty_factory.cpp", @@ -278,7 +275,6 @@ BASE_SRCS_IOS = struct( "src/ports/*mozalloc*", "src/ports/*nacl*", "src/ports/*win*", - "src/ports/SkFontHost_fontconfig.cpp", "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom_directory_factory.cpp", "src/ports/SkFontMgr_custom_embedded_factory.cpp", diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp deleted file mode 100644 index 423527c18f..0000000000 --- a/src/fonts/SkFontMgr_fontconfig.cpp +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "../ports/SkFontMgr_FontConfigInterface.cpp" diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp deleted file mode 100644 index 90da2fd5ca..0000000000 --- a/src/ports/SkFontHost_fontconfig.cpp +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkFontMgr_FontConfigInterface_factory.cpp" |