From e3fa811657ecf4ab694d026752a81080c6b10611 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Wed, 1 Jun 2016 07:08:56 -0700 Subject: [GN] Add support for disabling opts via SK_BUILD_NO_OPTS define. When targetting iOS and using gyp to generate the build files, it is not possible to select files to build depending on the architecture. Due to that, the skia code was disabling all optimisation when SK_BUILD_FOR_IOS was defined. Since it is possible to select the correct optimised version when using gn, this pessimisation is hurting the build. Introduce a new define to disable the optimisation SK_BUILD_NO_OPTS. It will be used by Chromium when building skia for iOS with gyp but not gn. Define SK_BUILD_NO_OPTS along-side SK_BUILD_FOR_IOS for all files that look like build configuration (Xcode projects, gyp configuration files, public.bzl) in order to avoid introducing breakage on those builds. BUG=607933 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002423002 Review-Url: https://codereview.chromium.org/2002423002 --- bench/SkBlend_optsBench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bench') diff --git a/bench/SkBlend_optsBench.cpp b/bench/SkBlend_optsBench.cpp index 08c3d7fd4b..29f3ed8331 100644 --- a/bench/SkBlend_optsBench.cpp +++ b/bench/SkBlend_optsBench.cpp @@ -151,7 +151,7 @@ private: typedef Benchmark INHERITED; }; -#if defined(SK_CPU_X86) && !defined(SK_BUILD_FOR_IOS) +#if defined(SK_CPU_X86) && !defined(SK_BUILD_NO_OPTS) #define BENCHES(fileName) \ DEF_BENCH( return new LinearSrcOverBench(fileName); ) \ DEF_BENCH( return new LinearSrcOverBench(fileName); ) \ -- cgit v1.2.3