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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: bench/TimerData.cpp

Issue 303913002: In Android framework, make tools depend on jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase, cleanups. Created 6 years, 6 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
« no previous file with comments | « bench/TimerData.h ('k') | bench/benchmain.cpp » ('j') | gyp/gm.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/TimerData.cpp
diff --git a/bench/TimerData.cpp b/bench/TimerData.cpp
index d3dbf285247ad42211e246c4649a2b64cfcf78ee..0cb000280b9315121952e04007b0dc5189866927 100644
--- a/bench/TimerData.cpp
+++ b/bench/TimerData.cpp
@@ -140,7 +140,6 @@ SkString TimerData::getResult(const char* doubleFormat,
return str;
}
-#ifdef SK_BUILD_JSON_WRITER
Json::Value TimerData::getJSON(uint32_t timerFlags,
Result result,
int itersPerTiming) {
@@ -223,4 +222,3 @@ Json::Value TimerData::getJSON(uint32_t timerFlags,
}
return dataNode;
}
-#endif // SK_BUILD_JSON_WRITER
« no previous file with comments | « bench/TimerData.h ('k') | bench/benchmain.cpp » ('j') | gyp/gm.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698