generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base: Renaming + conforming: post commit review changes for https://webrtc-codereview.appspot.com/17699005/

Browse Source 
BUG=N/A
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20709004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6467 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-06-17 14:48:44 +00:00
parent 5654b305e5
commit a685c9df62
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/base/base.gyp
View File

@ -453,7 +453,7 @@
}, },
}, { }, {
'conditions': [ 'conditions': [
['external_libraries==0', { ['build_json==1', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
], ],
@ -465,7 +465,7 @@
# When defined changes the include path for json.h to where it # When defined changes the include path for json.h to where it
# is expected to be when building json outside of the standalone # is expected to be when building json outside of the standalone
# build. # build.
'WEBRTC_EXTERNAL', 'WEBRTC_EXTERNAL_JSON',
], ],
}], }],
], ],
@ -489,7 +489,7 @@
], ],
}, },
'conditions': [ 'conditions': [
['external_libraries==0', { ['build_ssl==1', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/openssl/openssl.gyp:openssl', '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
], ],
@ -556,7 +556,7 @@
}, },
}, },
'conditions': [ 'conditions': [
['external_libraries==0', { ['build_ssl==1', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
] ]
@ -724,7 +724,7 @@
}], }],
['OS == "mac" or OS == "ios" or OS == "win"', { ['OS == "mac" or OS == "ios" or OS == "win"', {
'conditions': [ 'conditions': [
['external_libraries==0', { ['build_ssl==1', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
'<(DEPTH)/third_party/nss/nss.gyp:nspr', '<(DEPTH)/third_party/nss/nss.gyp:nspr',
@ -739,7 +739,7 @@
}], }],
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'conditions': [ 'conditions': [
['external_libraries==0', { ['build_ssl==1', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/build/linux/system.gyp:ssl', '<(DEPTH)/build/linux/system.gyp:ssl',
], ],

2
webrtc/base/json.h
View File

@ -14,7 +14,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#if !defined(WEBRTC_EXTERNAL) #if !defined(WEBRTC_EXTERNAL_JSON)
#include "json/json.h" #include "json/json.h"
#else #else
#include "third_party/jsoncpp/json.h" #include "third_party/jsoncpp/json.h"

2
webrtc/build/common.gypi
View File

@ -91,9 +91,11 @@
'enable_protobuf%': 1, 'enable_protobuf%': 1,
# Disable these to not build components which can be externally provided. # Disable these to not build components which can be externally provided.
'build_json%': 1,
'build_libjpeg%': 1, 'build_libjpeg%': 1,
'build_libyuv%': 1, 'build_libyuv%': 1,
'build_libvpx%': 1, 'build_libvpx%': 1,
'build_ssl%': 1,
# Disable by default # Disable by default
'have_dbus_glib%': 0, 'have_dbus_glib%': 0,