Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1415)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: bench/ResultsWriter.h

Issue 282053002: Generate bench/Android.mk from gyp. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselines
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« bench/Android.mk ('K') | « bench/DeferredSurfaceCopyBench.cpp ('k') | bench/benchmain.cpp » ('j') | include/utils/SkJSONCPP.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/ResultsWriter.h
diff --git a/bench/ResultsWriter.h b/bench/ResultsWriter.h
index 29d3d1df4120e7772e43fe3ab17650933dd3be31..20943f655bd8cb823360926a219e95d7711d52b1 100644
--- a/bench/ResultsWriter.h
+++ b/bench/ResultsWriter.h
@@ -77,6 +77,9 @@ private:
const char* fTimeFormat;
};
+// FIXME (scroggo): JSON is disabled in Android framework until we solve
+// skbug.com/2448
+#ifndef SK_BUILD_FOR_ANDROID
hal.canary 2014/05/15 14:29:36 #ifdef SK_BUILD_JSON_WRITER
scroggo 2014/05/15 20:00:54 Done.
/**
* This ResultsWriter handles writing out the results in JSON.
*
@@ -133,6 +136,7 @@ private:
Json::Value* fConfig;
};
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
/**
* This ResultsWriter writes out to multiple ResultsWriters.
*/
« bench/Android.mk ('K') | « bench/DeferredSurfaceCopyBench.cpp ('k') | bench/benchmain.cpp » ('j') | include/utils/SkJSONCPP.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698