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 /tools/picture_utils.cpp | |
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 'tools/picture_utils.cpp')
0 files changed, 0 insertions, 0 deletions