From 135a1b10fef1ee158f8f2379c2a7429eead004e0 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 15 Aug 2017 13:13:59 -0400 Subject: 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 Commit-Queue: Mike Klein --- public.bzl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'public.bzl') 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", -- cgit v1.2.3