diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-17 14:48:44 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-17 14:48:44 +0000 |
| commit | a487491fd34f905fc40c3bbde9f1f597f185a881 (patch) | |
| tree | 98b5cf5f8be917415dae4aee7c5d2a0a3d5d81a0 | |
| parent | fd6b7a5cce1e4cd32bf4a598a6bcfd63d22fe563 (diff) | |
| download | webrtc-a487491fd34f905fc40c3bbde9f1f597f185a881.tar.gz | |
base: Renaming + conforming: post commit review changes for https://webrtc-codereview.appspot.com/17699005/
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/webrtc@6467 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | base/base.gyp | 12 | ||||
| -rw-r--r-- | base/json.h | 2 | ||||
| -rw-r--r-- | build/common.gypi | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/base/base.gyp b/base/base.gyp index d8972277..330ea82a 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -453,7 +453,7 @@ }, }, { 'conditions': [ - ['external_libraries==0', { + ['build_json==1', { 'dependencies': [ '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', ], @@ -465,7 +465,7 @@ # When defined changes the include path for json.h to where it # is expected to be when building json outside of the standalone # build. - 'WEBRTC_EXTERNAL', + 'WEBRTC_EXTERNAL_JSON', ], }], ], @@ -489,7 +489,7 @@ ], }, 'conditions': [ - ['external_libraries==0', { + ['build_ssl==1', { 'dependencies': [ '<(DEPTH)/third_party/openssl/openssl.gyp:openssl', ], @@ -556,7 +556,7 @@ }, }, 'conditions': [ - ['external_libraries==0', { + ['build_ssl==1', { 'dependencies': [ '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', ] @@ -724,7 +724,7 @@ }], ['OS == "mac" or OS == "ios" or OS == "win"', { 'conditions': [ - ['external_libraries==0', { + ['build_ssl==1', { 'dependencies': [ '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', '<(DEPTH)/third_party/nss/nss.gyp:nspr', @@ -739,7 +739,7 @@ }], ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 'conditions': [ - ['external_libraries==0', { + ['build_ssl==1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:ssl', ], diff --git a/base/json.h b/base/json.h index a8f76be1..9d45ded9 100644 --- a/base/json.h +++ b/base/json.h @@ -14,7 +14,7 @@ #include <string> #include <vector> -#if !defined(WEBRTC_EXTERNAL) +#if !defined(WEBRTC_EXTERNAL_JSON) #include "json/json.h" #else #include "third_party/jsoncpp/json.h" diff --git a/build/common.gypi b/build/common.gypi index 5625c332..cbc398e4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -91,9 +91,11 @@ 'enable_protobuf%': 1, # Disable these to not build components which can be externally provided. + 'build_json%': 1, 'build_libjpeg%': 1, 'build_libyuv%': 1, 'build_libvpx%': 1, + 'build_ssl%': 1, # Disable by default 'have_dbus_glib%': 0, |