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 | |
| 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>
| -rw-r--r-- | dm/DM.cpp | 2 | ||||
| -rw-r--r-- | public.bzl | 10 | ||||
| -rw-r--r-- | tools/flags/SkCommandLineFlags.cpp | 7 |
3 files changed, 10 insertions, 9 deletions
@@ -1291,7 +1291,7 @@ int main(int argc, char** argv) { initializeEventTracingForTools(); -#if defined(SK_BUILD_FOR_IOS) +#if !defined(GOOGLE3) && defined(SK_BUILD_FOR_IOS) cd_Documents(); #endif setbuf(stdout, nullptr); 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", diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp index bfc9f5eebc..69382b412e 100644 --- a/tools/flags/SkCommandLineFlags.cpp +++ b/tools/flags/SkCommandLineFlags.cpp @@ -11,12 +11,7 @@ #include <stdlib.h> -#if defined(GOOGLE3) && defined(SK_BUILD_FOR_IOS) - // This is defined by //base only for iOS (I don't know why). - DECLARE_bool(undefok) -#else - DEFINE_bool(undefok, false, "Silently ignore unknown flags instead of crashing."); -#endif +DEFINE_bool(undefok, false, "Silently ignore unknown flags instead of crashing."); template <typename T> static void ignore_result(const T&) {} |