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

Issue 1291283003: Include webrtc/base/json.h rather than from jsoncpp directly. (Closed)

Created:
5 years, 4 months ago by phoglund
Modified:
5 years, 4 months ago
Reviewers:
AlexG, tkchin_webrtc
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com, perkj_webrtc, mflodman
Base URL:
https://chromium.googlesource.com/external/webrtc@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Include webrtc/base/json.h rather than from jsoncpp directly. This makes us use the clever code that adapts the path depending on where we build, so it works in google3 too. BUG=None Committed: https://crrev.com/9d15c66830143e391e605ba9b6350617d047c12b Cr-Commit-Position: refs/heads/master@{#9752}

Patch Set 1 #

Patch Set 2 : Introducing WEBRTC_USE_OWN_ICU #

Patch Set 3 : Just including base json #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M webrtc/modules/video_capture/android/device_info_android.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 14 (5 generated)
phoglund
AFAIK this should be functionally the same. Tested by building AppRTCDemo and making sure it ...
5 years, 4 months ago (2015-08-18 14:51:13 UTC) #2
phoglund
Hm, I need to do some more thinking about this issue. talk/app/webrtc/java/jni/jni_helpers.cc also uses unistr.h.
5 years, 4 months ago (2015-08-19 12:49:01 UTC) #4
phoglund
OK, this could maybe work.
5 years, 4 months ago (2015-08-19 13:55:31 UTC) #6
phoglund
PTAL
5 years, 4 months ago (2015-08-20 16:27:04 UTC) #7
tkchin_webrtc
On 2015/08/20 16:27:04, phoglund wrote: > PTAL I know nothing about android device info :) ...
5 years, 4 months ago (2015-08-20 18:57:40 UTC) #8
phoglund
All right, I'll just go ahead and commit this then. Alex, let me know if ...
5 years, 4 months ago (2015-08-21 07:18:00 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1291283003/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1291283003/40001
5 years, 4 months ago (2015-08-21 07:18:12 UTC) #12
commit-bot: I haz the power
Committed patchset #3 (id:40001)
5 years, 4 months ago (2015-08-21 08:00:42 UTC) #13
commit-bot: I haz the power
5 years, 4 months ago (2015-08-21 08:00:50 UTC) #14
Message was sent while issue was closed.
Patchset 3 (id:??) landed as
https://crrev.com/9d15c66830143e391e605ba9b6350617d047c12b
Cr-Commit-Position: refs/heads/master@{#9752}

Powered by Google App Engine
This is Rietveld 408576698