Visual bench on native android

tools/VisualBench.cpp

Index: tools/VisualBench.cpp
diff --git a/tools/VisualBench.cpp b/tools/VisualBench.cpp
index fd0662a008fe7b9b2ca1001b27eefa5cd9f8b7b0..c0343d715f4f3614d7b1607a24995d8fa4aa1872 100644
--- a/tools/VisualBench.cpp
+++ b/tools/VisualBench.cpp
@@ -56,7 +56,7 @@ VisualBench::VisualBench(void* hwnd, int argc, char** argv)
             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();
             }
         }
@@ -126,7 +126,9 @@ void VisualBench::resetContext() {
 }
 
 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) {