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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: include/utils/SkJSONCPP.h

Issue 303913002: In Android framework, make tools depend on jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Do as Thoreau would do. 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 | « gyp/jsoncpp.gyp ('k') | tools/PictureResultsWriter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/utils/SkJSONCPP.h
diff --git a/include/utils/SkJSONCPP.h b/include/utils/SkJSONCPP.h
index 0582e8f5a99393229dbc90505929195904727253..de827687e0f6b5eab253dfecb6d12a49b27ee24d 100644
--- a/include/utils/SkJSONCPP.h
+++ b/include/utils/SkJSONCPP.h
@@ -10,8 +10,6 @@
#ifndef SkJSONCPP_DEFINED
#define SkJSONCPP_DEFINED
-#ifdef SK_BUILD_JSON_WRITER
-
#ifdef SK_BUILD_FOR_WIN
// json includes xlocale which generates warning 4530 because we're
// compiling without exceptions;
@@ -26,6 +24,4 @@
#pragma warning(pop)
#endif
-#endif // SK_BUILD_JSON_WRITER
-
#endif // SkJSONCPP_DEFINED
« no previous file with comments | « gyp/jsoncpp.gyp ('k') | tools/PictureResultsWriter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698