Remove the expat and jsoncpp dependencies to reduce binary size.

The dependency on third_party/expat/ is removed.

The dependency on third_party/jsoncpp is removed from
libjingle_peerconnection while peerconnection_client still
depends on it.

BUG=webrtc:7516

Review-Url: https://codereview.webrtc.org/2832283002
Cr-Commit-Position: refs/heads/master@{#17848}
This commit is contained in:
zhihuang 2017-04-24 12:05:06 -07:00 committed by Commit bot
parent 9d1ea5cc22
commit 44d305a806
4 changed files with 20 additions and 23 deletions

View File

@ -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) {

View File

@ -517,15 +517,13 @@ if (is_linux || is_win) {
"//webrtc/api:video_frame_api",
"//webrtc/base:rtc_base",
"//webrtc/base:rtc_base_approved",
"//webrtc/base:rtc_json",
"//webrtc/media:rtc_media",
"//webrtc/modules/video_capture:video_capture_module",
"//webrtc/pc:libjingle_peerconnection",
"//webrtc/system_wrappers:field_trial_default",
"//webrtc/system_wrappers:metrics_default",
]
if (rtc_build_json) {
deps += [ "//third_party/jsoncpp" ]
}
}
rtc_executable("peerconnection_server") {

View File

@ -91,13 +91,6 @@ rtc_static_library("rtc_p2p") {
"../system_wrappers:field_trial_api",
]
if (rtc_build_expat) {
deps += [ "//third_party/expat" ]
public_deps = [
"//third_party/expat",
]
}
public_configs = [ ":rtc_p2p_inherited_config" ]
if (build_with_chromium) {

View File

@ -78,7 +78,6 @@ declare_args() {
rtc_enable_sctp = true
# Disable these to not build components which can be externally provided.
rtc_build_expat = true
rtc_build_json = true
rtc_build_libjpeg = true
rtc_build_libsrtp = true