From 0b47d4b520e8f0d4259cf5f263f502ccf9eaf0e7 Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 13 Nov 2015 07:42:26 -0800 Subject: [PATCH] Exclude src/android from CMake build too. It requires src/codec. BUG=skia: CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot Review URL: https://codereview.chromium.org/1438123008 --- cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c6614f3..cd71de7 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -101,7 +101,7 @@ if (WIN32) endif() remove_srcs(../src/gpu/gl/angle/*) # TODO -remove_srcs(../src/codec/*) # TODO: Requires Chromium's libjpeg-turbo, and incompatible giflib. +remove_srcs(../src/codec/* ../src/android/*) # TODO: Requires Chromium's libjpeg-turbo, and incompatible giflib. # Certain files must be compiled with support for SSSE3 or SSE4.1 intrinsics. file (GLOB_RECURSE ssse3_srcs ../src/*ssse3*.cpp ../src/*SSSE3*.cpp) -- 2.7.4