Fix linking errors on android builds due to cdd0f92b1ac

tools/bbh_shootout.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchTimer.h"
 #include "LazyDecodeBitmap.h"
 #include "PictureBenchmark.h"
 #include "PictureRenderer.h"
 #include "SkBenchmark.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkCommandLineFlags.h"
 
 typedef sk_tools::PictureRenderer::BBoxHierarchyType BBoxType;
 static const int kBBoxTypeCount = sk_tools::PictureRenderer::kLast_BBoxHierarchyType + 1;
 
 
 DEFINE_string2(skps, r, "", "The list of SKPs to benchmark.");
-DEFINE_string(bbh, "", "The set of bbox types to test. If empty, all are tested. "
+DEFINE_string(bb_types, "", "The set of bbox types to test. If empty, all are tested. "
                        "Should be one or more of none, quadtree, rtree, tilegrid.");
 DEFINE_int32(record, 100, "Number of times to record each SKP.");
 DEFINE_int32(playback, 1, "Number of times to playback each SKP.");
 DEFINE_int32(tilesize, 256, "The size of a tile.");
 
 struct Measurement {
     SkString fName;
     double fRecordAverage[kBBoxTypeCount];
     double fPlaybackAverage[kBBoxTypeCount];
 };
@@ skipping 44 matching lines @@
         timer->end();
     }
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     SkAutoGraphics ag;
     bool includeBBoxType[kBBoxTypeCount];
     for (int bBoxType = 0; bBoxType < kBBoxTypeCount; ++bBoxType) {
-        includeBBoxType[bBoxType] = (FLAGS_bbh.count() == 0) ||
-            FLAGS_bbh.contains(kBBoxHierarchyTypeNames[bBoxType]);
+        includeBBoxType[bBoxType] = (FLAGS_bb_types.count() == 0) ||
+            FLAGS_bb_types.contains(kBBoxHierarchyTypeNames[bBoxType]);
     }
     // go through all the pictures
     SkTArray<Measurement> measurements;
     for (int index = 0; index < FLAGS_skps.count(); ++index) {
         const char* path = FLAGS_skps[index];
         SkPicture* picture = pic_from_path(path);
         if (NULL == picture) {
             SkDebugf("Couldn't create picture. Ignoring path: %s\n", path);
             continue;
         }
@@ skipping 83 matching lines @@
     }
     SkDebugf("\nWrote data to gnuplot-readable files: %s %s\n", pbTitle, recTitle);
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif