|
In Android framework, make tools depend on jsoncpp
Always build the tools with JSON, but either build our own
or use the system's.
Rename skia_build_json_writer to skia_use_system_jsoncpp,
since we now always build with JSON.
Remove SK_BUILD_JSON_WRITER, which was only there so
we could build without JSON it in the framework.
BUG= skia:2448
Committed: https://skia.googlesource.com/skia/+/f01a6c3663970ccd6e1882e76a887e0fda467b77
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+12 lines, -83 lines) |
Patch |
|
M |
bench/ResultsWriter.h
|
View
|
1
|
2 chunks |
+0 lines, -3 lines |
0 comments
|
Download
|
|
M |
bench/ResultsWriter.cpp
|
View
|
1
|
2 chunks |
+0 lines, -3 lines |
0 comments
|
Download
|
|
M |
bench/TimerData.h
|
View
|
1
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
bench/TimerData.cpp
|
View
|
1
|
2 chunks |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
bench/benchmain.cpp
|
View
|
1
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
|
M |
dm/DM.cpp
|
View
|
1
|
2 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
|
M |
dm/DMExpectations.h
|
View
|
1
|
2 chunks |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
gm/gm_expectations.h
|
View
|
1
|
8 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
|
M |
gm/gm_expectations.cpp
|
View
|
1
|
12 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
|
M |
gm/gmmain.cpp
|
View
|
1
|
8 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
|
M |
gyp/common_conditions.gypi
|
View
|
1
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
|
M |
gyp/common_variables.gypi
|
View
|
1
|
2 chunks |
+3 lines, -5 lines |
0 comments
|
Download
|
|
M |
gyp/jsoncpp.gyp
|
View
|
1
2
|
1 chunk |
+9 lines, -2 lines |
0 comments
|
Download
|
|
M |
include/utils/SkJSONCPP.h
|
View
|
1
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
|
M |
tools/PictureResultsWriter.h
|
View
|
1
|
2 chunks |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
tools/bench_pictures_main.cpp
|
View
|
1
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
Total messages: 13 (0 generated)
|