commit 817c72ad40bfbb42824010837c0bcc572a9eb9bc
author djsollen <djsollen@google.com> Thu Jan 28 13:57:02 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Jan 28 13:57:02 2016 -0800
tree 53113f8abf6b1715bce35427c4a8d50326736ec4
parent 54d60293cecb384de5683d9bea925c97f6ed485b

Fix broken Android framework builds
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1641173003

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

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index c07bfa0..5a00952 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -436,12 +436,11 @@
     #undef CPU_CONFIG
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-    if (is_cpu_config_allowed("hwui", config)) {
-        Config config = { "hwui", Benchmark::kHWUI_Backend, kRGBA_8888_SkColorType,
+    if (config->getTag().equals("hwui")) {
+        Config config = { SkString("hwui"), Benchmark::kHWUI_Backend, kRGBA_8888_SkColorType,
                           kPremul_SkAlphaType, 0, kBogusGLContextType, kBogusGLContextOptions,
                           false };
         configs->push_back(config);
-        return;
     }
 #endif
 }