From fdd52c48bbeb779a39cdca0e1d38217ceb8874ed Mon Sep 17 00:00:00 2001 From: msarett Date: Wed, 9 Mar 2016 15:12:31 -0800 Subject: [PATCH] Don't build CG on Linux CMake BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1784663002 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot Review URL: https://codereview.chromium.org/1784663002 --- cmake/CMakeLists.txt | 4 ++++ src/ports/SkImageGeneratorCG.cpp | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index e5c8a35e68..f0b0e31d91 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -105,6 +105,10 @@ remove_srcs( ../src/ports/SkImageGenerator_none.cpp ../src/ports/SkTLS_none.cpp) +if (NOT APPLE) + remove_srcs(../src/ports/SkImageGeneratorCG.cpp) +endif() + if (WIN32) if(SKIA_GDI) remove_srcs(../src/ports/SkFontMgr_win_dw_factory.cpp) diff --git a/src/ports/SkImageGeneratorCG.cpp b/src/ports/SkImageGeneratorCG.cpp index cf00ea703d..a3474a1c78 100644 --- a/src/ports/SkImageGeneratorCG.cpp +++ b/src/ports/SkImageGeneratorCG.cpp @@ -6,7 +6,6 @@ */ #include "SkImageGeneratorCG.h" -#include "SkUnpremultiply.h" #ifdef SK_BUILD_FOR_MAC #include