Visual bench on native android

tools/VisualBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include "VisualBench.h"
 
@@ skipping 38 matching lines @@
     // load all SKPs
     SkTArray<SkString> skps;
     for (int i = 0; i < FLAGS_skps.count(); i++) {
         if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
             skps.push_back() = FLAGS_skps[i];
             fTimings.push_back().fName = FLAGS_skps[i];
         } else {
             SkOSFile::Iter it(FLAGS_skps[i], ".skp");
             SkString path;
             while (it.next(&path)) {
-                skps.push_back() = SkOSPath::Join(FLAGS_skps[0], path.c_str());
+                skps.push_back() = SkOSPath::Join(FLAGS_skps[i], path.c_str());
                 fTimings.push_back().fName = path.c_str();
             }
         }
     }
 
     for (int i = 0; i < skps.count(); i++) {
         SkFILEStream stream(skps[i].c_str());
         if (stream.isValid()) {
             fPictures.push_back(SkPicture::CreateFromStream(&stream));
         } else {
@@ skipping 49 matching lines @@
 
     // setup contexts
     fContext.reset(GrContext::Create(kOpenGL_GrBackend, (GrBackendContext)fInterface.get()));
     SkASSERT(fContext);
 
     // setup rendertargets
     this->setupRenderTarget();
 }
 
 void VisualBench::setupRenderTarget() {
-    fRenderTarget.reset(this->renderTarget(fAttachmentInfo, fInterface, fContext));
+    if (fContext) {
+        fRenderTarget.reset(this->renderTarget(fAttachmentInfo, fInterface, fContext));
+    }
 }
 
 inline void VisualBench::renderFrame(SkCanvas* canvas) {
     canvas->drawPicture(fPictures[fCurrentPicture]);
     fContext->flush();
     INHERITED::present();
 }
 
 void VisualBench::printStats() {
     const SkTArray<double>& measurements = fTimings[fCurrentPicture].fMeasurements;
@@ skipping 82 matching lines @@
 
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }
 
 SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
     return new VisualBench(hwnd, argc, argv);
 }