diff options
| author | sherouk <sherouk@google.com> | 2015-08-18 02:40:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 09:41:06 +0000 |
| commit | 7fdb0f386b7471a9063dcb98211cb35b44bce90a (patch) | |
| tree | 7f388f67082fc2d9421a5923e2c0969734c17c16 /skia/BUILD.gn | |
| parent | 3fbd09dca8080c5d3baee5b4fdde820bbe721132 (diff) | |
| download | chromium_src-7fdb0f386b7471a9063dcb98211cb35b44bce90a.zip chromium_src-7fdb0f386b7471a9063dcb98211cb35b44bce90a.tar.gz chromium_src-7fdb0f386b7471a9063dcb98211cb35b44bce90a.tar.bz2 | |
Editing sources for //skia.
BUG=459705
Review URL: https://codereview.chromium.org/1297673003
Cr-Commit-Position: refs/heads/master@{#343867}
Diffstat (limited to 'skia/BUILD.gn')
| -rw-r--r-- | skia/BUILD.gn | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index cba5ceb..4182c45 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -289,7 +289,6 @@ component("skia") { "ext/image_operations.cc", "ext/opacity_filter_canvas.cc", "ext/pixel_ref_utils.cc", - "ext/platform_canvas.cc", "ext/platform_device.cc", "ext/platform_device_linux.cc", "ext/platform_device_mac.cc", @@ -302,7 +301,10 @@ component("skia") { "ext/skia_utils_win.cc", ] - if (current_cpu == "x86" || current_cpu == "x64") { + if (!is_ios) { + sources += [ "ext/platform_canvas.cc" ] + } + if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) { sources += [ "ext/convolver_SSE2.cc" ] } else if (current_cpu == "mipsel" && mips_dsp_rev >= 2) { sources += [ "ext/convolver_mips_dspr2.cc" ] @@ -432,7 +434,7 @@ component("skia") { sources += [ "ext/bitmap_platform_device_mac.cc" ] } else if (use_cairo) { sources += [ "ext/bitmap_platform_device_cairo.cc" ] - } else { + } else if (!is_ios) { sources += [ "ext/bitmap_platform_device_skia.cc" ] } @@ -489,6 +491,20 @@ component("skia") { configs -= [ "//build/config/compiler:optimize" ] configs += [ "//build/config/compiler:optimize_max" ] } + + if (is_ios) { + libs = [ "ImageIO.framework" ] + set_sources_assignment_filter([]) + sources += [ + "//third_party/skia/src/ports/SkFontHost_mac.cpp", + "//third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp", + "//third_party/skia/src/utils/mac/SkStream_mac.cpp", + ] + set_sources_assignment_filter(sources_assignment_filter) + + # To disable warning "CGContextSelectFont' is deprecated" + cflags = [ "-Wno-deprecated-declarations" ] + } } # Separated out so it can be compiled with different flags for SSE. |