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

Unified Diff: BUILD.public

Issue 1471033002: Fix Google3 fonts. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Fix include. Created 5 years, 1 month 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 | « no previous file | gyp/ports.gyp » ('j') | src/ports/SkFontConfigInterfaceDirect.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.public
diff --git a/BUILD.public b/BUILD.public
index a029a9fa02773dceb23f7cb881696053849f118a..773b94fd6fdf40ce78face56a05ab46ea7d0379e 100644
--- a/BUILD.public
+++ b/BUILD.public
@@ -41,7 +41,6 @@ BASE_SRCS = glob(
# Exclude multiple definitions.
# TODO(mtklein): Move to opts?
"src/doc/SkDocument_PDF_None.cpp", # We use SkDocument_PDF.cpp.
- "src/fonts/*fontconfig*",
"src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
"src/gpu/gl/GrGLDefaultInterface_native.cpp",
@@ -88,15 +87,16 @@ BASE_SRCS_UNIX = glob(
"src/opts/SkBlitRow_opts_none.cpp",
"src/ports/*android*",
"src/ports/*chromium*",
- "src/ports/*fontconfig*",
- "src/ports/*FontConfig*",
"src/ports/*mac*",
"src/ports/*mozalloc*",
"src/ports/*nacl*",
"src/ports/*win*",
+ "src/ports/SkFontConfigInterface_direct_factory.cpp",
+ "src/ports/SkFontMgr_custom_directory_factory.cpp",
"src/ports/SkFontMgr_custom_embedded_factory.cpp",
"src/ports/SkFontMgr_empty_factory.cpp",
"src/ports/SkImageDecoder_CG.cpp",
+ "src/ports/SkFontMgr_fontconfig_factory.cpp",
"src/ports/SkImageDecoder_WIC.cpp",
"src/ports/SkImageDecoder_empty.cpp",
"src/ports/SkImageGenerator_none.cpp",
@@ -132,6 +132,8 @@ BASE_SRCS_ANDROID = glob(
"src/ports/*nacl*",
"src/ports/*win*",
"src/ports/SkDebug_stdio.cpp",
+ "src/ports/SkFontConfigInterface_direct_factory.cpp",
+ "src/ports/SkFontConfigInterface_direct_google3_factory.cpp",
"src/ports/SkFontMgr_custom_directory_factory.cpp",
"src/ports/SkFontMgr_custom_embedded_factory.cpp",
"src/ports/SkFontMgr_empty_factory.cpp",
@@ -174,6 +176,8 @@ BASE_SRCS_IOS = glob(
"src/ports/*win*",
"src/ports/SkDebug_stdio.cpp",
"src/ports/SkFontMgr_custom.cpp",
+ "src/ports/SkFontConfigInterface_direct_factory.cpp",
+ "src/ports/SkFontConfigInterface_direct_google3_factory.cpp",
"src/ports/SkFontMgr_custom_directory_factory.cpp",
"src/ports/SkFontMgr_custom_embedded_factory.cpp",
"src/ports/SkFontMgr_empty_factory.cpp",
@@ -261,12 +265,13 @@ INCLUDES = [
"src/image",
"src/lazy",
"src/opts",
+ "src/ports",
"src/pdf",
"src/sfnt",
"src/utils",
"third_party/etc1",
"third_party/ktx",
-]
+] + EXTERNAL_INCLUDES
## :dm
« no previous file with comments | « no previous file | gyp/ports.gyp » ('j') | src/ports/SkFontConfigInterfaceDirect.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698