Chromium Code Reviews| Index: skia/BUILD.gn |
| diff --git a/skia/BUILD.gn b/skia/BUILD.gn |
| index 9ddc75e3e9a7b38a5205ae39cf2cf4086ceba39e..f1e4ba93ca4602cff9205ca8ac0a360a263fa539 100644 |
| --- a/skia/BUILD.gn |
| +++ b/skia/BUILD.gn |
| @@ -43,6 +43,10 @@ config("skia_config") { |
| "//third_party/skia/third_party/vulkan", |
| ] |
| + if (!is_ios) { |
| + include_dirs += [ "//third_party/skia/include/codec" ] |
|
scroggo_chromium
2017/06/05 19:00:53
So we're not using SkCodec on ios? What happens th
cblume
2017/06/06 04:04:35
That is correct, we do not use SkCodec on iOS. Nor
|
| + } |
| + |
| defines = skia_for_chromium_defines |
| defines += [ |
| "SK_HAS_PNG_LIBRARY", |
| @@ -114,6 +118,7 @@ config("skia_library_config") { |
| "//third_party/skia/src/sfnt", |
| "//third_party/skia/src/utils", |
| "//third_party/skia/src/lazy", |
| + "//third_party/skia/third_party/gif", |
| ] |
| if (is_mac || is_ios) { |
| include_dirs += [ "//third_party/skia/include/utils/mac" ] |
| @@ -285,6 +290,29 @@ component("skia") { |
| "//third_party/skia/src/sfnt/SkOTTable_name.cpp", |
| "//third_party/skia/src/sfnt/SkOTUtils.cpp", |
| ] |
| + if (!is_ios) { |
| + sources += [ |
| + "//third_party/skia/src/codec/SkBmpCodec.cpp", |
| + "//third_party/skia/src/codec/SkBmpMaskCodec.cpp", |
| + "//third_party/skia/src/codec/SkBmpRLECodec.cpp", |
| + "//third_party/skia/src/codec/SkBmpStandardCodec.cpp", |
| + "//third_party/skia/src/codec/SkCodec.cpp", |
| + "//third_party/skia/src/codec/SkGifCodec.cpp", |
| + "//third_party/skia/src/codec/SkIcoCodec.cpp", |
| + "//third_party/skia/src/codec/SkJpegCodec.cpp", |
| + "//third_party/skia/src/codec/SkJpegDecoderMgr.cpp", |
| + "//third_party/skia/src/codec/SkJpegUtility.cpp", |
| + "//third_party/skia/src/codec/SkMaskSwizzler.cpp", |
| + "//third_party/skia/src/codec/SkMasks.cpp", |
| + "//third_party/skia/src/codec/SkPngCodec.cpp", |
| + "//third_party/skia/src/codec/SkSampler.cpp", |
| + "//third_party/skia/src/codec/SkStreamBuffer.cpp", |
| + "//third_party/skia/src/codec/SkSwizzler.cpp", |
| + "//third_party/skia/src/codec/SkWbmpCodec.cpp", |
| + "//third_party/skia/src/codec/SkWebpCodec.cpp", |
| + "//third_party/skia/third_party/gif/SkGifImageReader.cpp", |
| + ] |
| + } |
| # This and skia_opts are really the same conceptual target so share headers. |
| allow_circular_includes_from = [ ":skia_opts" ] |