Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Issue 228893003: Move build guard to fix Android framework compile. (Closed)

Created:
6 years, 8 months ago by scroggo
Modified:
6 years, 8 months ago
Reviewers:
egdaniel
CC:
skia-review_googlegroups.com
Base URL:
https://skia.googlesource.com/skia.git@master
Visibility:
Public.

Description

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. Committed: http://code.google.com/p/skia/source/detail?r=14132

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 5 (0 generated)
scroggo
6 years, 8 months ago (2014-04-10 14:49:24 UTC) #1
egdaniel
lgtm
6 years, 8 months ago (2014-04-10 14:51:30 UTC) #2
scroggo
The CQ bit was checked by scroggo@google.com
6 years, 8 months ago (2014-04-10 14:52:09 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/scroggo@google.com/228893003/1
6 years, 8 months ago (2014-04-10 14:52:09 UTC) #4
commit-bot: I haz the power
6 years, 8 months ago (2014-04-10 15:38:07 UTC) #5
Message was sent while issue was closed.
Change committed as 14132

Powered by Google App Engine
This is Rietveld 408576698