diff options
| author |  scroggo <scroggo@google.com> | 2015-12-01 08:08:18 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-01 08:08:18 -0800 |
| commit | 9323dc6a72de301f23e1187adc2365395b4b23d8 (patch) | |
| tree | 24c461e3cfac4d42f0df3cdf365ed15b46c25eb0 /bench | |
| parent | a0a024e323ebf73ea4559d4b29f937902703828b (diff) | |
Revert of Fix Android framework build (patchset #1 id:1 of https://codereview.chromium.org/1491563003/ )
Reason for revert:
eeebdb538d476c1bfc8b63a946094ca1b505ecd1 was reverted, so this one needs to be reverted, too
Original issue's description:
> Fix Android framework build
>
> eeebdb538d476c1bfc8b63a946094ca1b505ecd1 did not update a Config that
> only builds if SK_BUILD_FOR_ANDROID_FRAMEWORK. This appears to be the
> necessary parameter that is missing.
>
> BUG=skia:2992
>
> Committed: https://skia.googlesource.com/skia/+/cb6cb21cd9d27054810d2c80ef534dcddd615d4b
TBR=bsalomon@google.com,tomhudson@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:2992
Review URL: https://codereview.chromium.org/1487033002
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/nanobench.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index ee6e3858a2..99483ebd99 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -455,8 +455,7 @@ static void create_configs(SkTDArray<Config>* configs) { #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK if (is_cpu_config_allowed("hwui")) { Config config = { "hwui", Benchmark::kHWUI_Backend, kRGBA_8888_SkColorType, - kPremul_SkAlphaType, 0, kBogusGLContextType, kNone_GLContextOptions, - false }; + kPremul_SkAlphaType, 0, kBogusGLContextType, false }; configs->push(config); } #endif |