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

Issue 303913002: In Android framework, make tools depend on jsoncpp (Closed)

Created:
6 years, 6 months ago by scroggo
Modified:
6 years, 6 months ago
Reviewers:
djsollen, reed1
CC:
skia-review_googlegroups.com
Base URL:
https://skia.googlesource.com/skia.git@master
Visibility:
Public.

Description

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

Patch Set 1 #

Patch Set 2 : Rebase, cleanups. #

Total comments: 2

Patch Set 3 : Do as Thoreau would do. #

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

Messages

Total messages: 13 (0 generated)
scroggo
The difference in the makefiles is that bench/Android.mk, gm/Android.mk, and dm/Android.mk now have: LOCAL_STATIC_LIBRARIES := ...
6 years, 6 months ago (2014-06-17 20:54:07 UTC) #1
djsollen
https://codereview.chromium.org/303913002/diff/20001/gyp/gm.gyp File gyp/gm.gyp (right): https://codereview.chromium.org/303913002/diff/20001/gyp/gm.gyp#newcode59 gyp/gm.gyp:59: 'jsoncpp.a', why do we do this here and not ...
6 years, 6 months ago (2014-06-17 21:03:11 UTC) #2
scroggo
https://codereview.chromium.org/303913002/diff/20001/gyp/gm.gyp File gyp/gm.gyp (right): https://codereview.chromium.org/303913002/diff/20001/gyp/gm.gyp#newcode59 gyp/gm.gyp:59: 'jsoncpp.a', On 2014/06/17 21:03:11, djsollen wrote: > why do ...
6 years, 6 months ago (2014-06-17 21:12:35 UTC) #3
djsollen
lgtm
6 years, 6 months ago (2014-06-18 15:55:23 UTC) #4
djsollen
The CQ bit was checked by djsollen@google.com
6 years, 6 months ago (2014-06-18 15:56:13 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/scroggo@google.com/303913002/40001
6 years, 6 months ago (2014-06-18 15:56:57 UTC) #6
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-18 15:57:05 UTC) #7
commit-bot: I haz the power
Presubmit check for 303913002-40001 failed and returned exit status 1. Running presubmit commit checks ...
6 years, 6 months ago (2014-06-18 15:57:06 UTC) #8
scroggo
Mike can you look over the change to include? It only undoes an ifdef that ...
6 years, 6 months ago (2014-06-18 15:57:26 UTC) #9
reed1
api lgtm
6 years, 6 months ago (2014-06-18 16:05:05 UTC) #10
scroggo
The CQ bit was checked by scroggo@google.com
6 years, 6 months ago (2014-06-18 17:16:23 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/scroggo@google.com/303913002/40001
6 years, 6 months ago (2014-06-18 17:16:37 UTC) #12
commit-bot: I haz the power
6 years, 6 months ago (2014-06-18 17:31:44 UTC) #13
Message was sent while issue was closed.
Change committed as f01a6c3663970ccd6e1882e76a887e0fda467b77

Powered by Google App Engine
This is Rietveld 408576698