diff options
| author | phoglund <phoglund@webrtc.org> | 2015-08-21 01:00:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 08:00:43 +0000 |
| commit | 9d15c66830143e391e605ba9b6350617d047c12b (patch) | |
| tree | f31f12eec571e63eedb6cdcd042f92a4a04e9f75 | |
| parent | 22ff75a1635597d96644084707645b11bb3e6f95 (diff) | |
| download | webrtc-9d15c66830143e391e605ba9b6350617d047c12b.tar.gz | |
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
Review URL: https://codereview.webrtc.org/1291283003
Cr-Commit-Position: refs/heads/master@{#9752}
| -rw-r--r-- | webrtc/modules/video_capture/android/device_info_android.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc/modules/video_capture/android/device_info_android.cc b/webrtc/modules/video_capture/android/device_info_android.cc index 02075d5e19..974717c4b7 100644 --- a/webrtc/modules/video_capture/android/device_info_android.cc +++ b/webrtc/modules/video_capture/android/device_info_android.cc @@ -14,8 +14,8 @@ #include <sstream> #include <vector> -#include "json/json.h" #include "unicode/unistr.h" +#include "webrtc/base/json.h" #include "webrtc/modules/video_capture/android/video_capture_android.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/ref_count.h" |