| Index: webrtc/base/BUILD.gn
|
| diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
|
| index 6f1d429f85d77620d61ca06aaa676670e78a9b19..9e5bdc671bc96df66723ec9fdc6ceed4e9e184a3 100644
|
| --- a/webrtc/base/BUILD.gn
|
| +++ b/webrtc/base/BUILD.gn
|
| @@ -368,6 +368,25 @@ config("rtc_base_warnings_config") {
|
| }
|
| }
|
|
|
| +rtc_source_set("rtc_json") {
|
| + defines = []
|
| + sources = [
|
| + "json.cc",
|
| + "json.h",
|
| + ]
|
| + if (rtc_build_json) {
|
| + public_deps = [
|
| + "//third_party/jsoncpp",
|
| + ]
|
| + } else {
|
| + include_dirs = [ "$rtc_jsoncpp_root" ]
|
| +
|
| + # When defined changes the include path for json.h to where it is
|
| + # expected to be when building json outside of the standalone build.
|
| + defines += [ "WEBRTC_EXTERNAL_JSON" ]
|
| + }
|
| +}
|
| +
|
| rtc_static_library("rtc_base") {
|
| cflags = []
|
| cflags_cc = []
|
| @@ -503,8 +522,6 @@ rtc_static_library("rtc_base") {
|
| configs += [ ":rtc_base_warnings_config" ]
|
| sources += [
|
| "callback.h",
|
| - "json.cc",
|
| - "json.h",
|
| "logsinks.cc",
|
| "logsinks.h",
|
| "mathutils.h",
|
| @@ -530,16 +547,6 @@ rtc_static_library("rtc_base") {
|
| "win32socketserver.h",
|
| ]
|
| }
|
| -
|
| - if (rtc_build_json) {
|
| - deps += [ "//third_party/jsoncpp" ]
|
| - } else {
|
| - include_dirs = [ "$rtc_jsoncpp_root" ]
|
| -
|
| - # When defined changes the include path for json.h to where it is
|
| - # expected to be when building json outside of the standalone build.
|
| - defines += [ "WEBRTC_EXTERNAL_JSON" ]
|
| - }
|
| } # !build_with_chromium
|
|
|
| if (rtc_build_ssl) {
|
|
|