diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-08-15 13:13:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-15 22:00:57 +0000 |
| commit | 135a1b10fef1ee158f8f2379c2a7429eead004e0 (patch) | |
| tree | f6f37a869ea6861f00208bc6b847d8f1fba1fee3 /public.bzl | |
| parent | 8618338c4afc7f8dd27e415ac44b40f2938cb363 (diff) | |
upstream cr/165303354
The only interesting difference here is that I've just skipped
cd_Documents() on Google3 iOS builds rather than adding a new target to
BUILD. We don't run the binary so it's kind of moot what directory it'd
run in.
Change-Id: I1994e0283d24bcc505fa9b2b7b58307eafa5be92
Reviewed-on: https://skia-review.googlesource.com/34742
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'public.bzl')
| -rw-r--r-- | public.bzl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/public.bzl b/public.bzl index dbe2d49812..80042730c9 100644 --- a/public.bzl +++ b/public.bzl @@ -249,7 +249,6 @@ BASE_SRCS_IOS = struct( "src/opts/*x86*", "src/opts/SkBlitMask_opts_arm*.cpp", "src/opts/SkBlitRow_opts_arm*.cpp", - "src/ports/*CG*", "src/ports/*FontConfig*", "src/ports/*FreeType*", "src/ports/*WIC*", @@ -437,6 +436,7 @@ INCLUDES = [ "src/core", "src/gpu", "src/image", + "src/images", "src/lazy", "src/opts", "src/ports", @@ -681,7 +681,13 @@ LINKOPTS_ANDROID = [ "-lEGL", ] -LINKOPTS_IOS = [] +LINKOPTS_IOS = [ + "-framework CoreFoundation", + "-framework CoreGraphics", + "-framework CoreText", + "-framework ImageIO", + "-framework MobileCoreServices", +] LINKOPTS_ALL = [ "-ldl", |