commit cb6cb21cd9d27054810d2c80ef534dcddd615d4b
author scroggo <scroggo@google.com> Tue Dec 01 07:53:37 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 01 07:53:37 2015 -0800
tree 86db6c0d5f7257addd30f9fdbf2517ce5f005499
parent c19247fd03b3498d3d6a6b44421ba75dd49a6ca0

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

Review URL: https://codereview.chromium.org/1491563003

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 6c42097..f742ef9 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -464,7 +464,8 @@
 #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, false };
+                          kPremul_SkAlphaType, 0, kBogusGLContextType, kNone_GLContextOptions,
+                          false };
         configs->push(config);
     }
 #endif