summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorhenrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-06-17 14:48:44 +0000
committerhenrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-06-17 14:48:44 +0000
commita487491fd34f905fc40c3bbde9f1f597f185a881 (patch)
tree98b5cf5f8be917415dae4aee7c5d2a0a3d5d81a0 /build
parentfd6b7a5cce1e4cd32bf4a598a6bcfd63d22fe563 (diff)
downloadwebrtc-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
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
1 files changed, 2 insertions, 0 deletions
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,