diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 15:37:52 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 15:37:52 +0000 |
| commit | ef93d294ef545c91028262478e4f1c7c2ed456b8 (patch) | |
| tree | 7160100e9c3bb810e698815b38842a5a8270c2cb /src/effects | |
| parent | defe6fdbc8edb2df0887c007450a8d8cc446f420 (diff) | |
Move build guard to fix Android framework compile.
After merging into the Android tree, this file was not compiling.
It turns out that it was because SK_SUPPORT_GPU was not defined. When
built by GYP, SK_SUPPORT_GPU is defined by GYP. When built by the
Android framework, we depend on SkUserConfig.h, which is included by
other files, to set SK_SUPPORT_GPU. Moving the includes outside of
#if SK_SUPPORT_GPU ensures that the dependency chain defining
SK_SUPPORT_GPU is included, so this code gets compiled as expected.
R=egdaniel@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/228893003
git-svn-id: http://skia.googlecode.com/svn/trunk@14132 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index f66233174a..22b33e8242 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#if SK_SUPPORT_GPU #include "SkTwoPointConicalGradient_gpu.h" #include "GrTBackendEffectFactory.h" #include "SkTwoPointConicalGradient.h" +#if SK_SUPPORT_GPU // For brevity typedef GrGLUniformManager::UniformHandle UniformHandle; |