Chromium Code Reviews| Index: webrtc/build/common.gypi |
| diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi |
| index 6ec0f1c9426b4105627d813e99fc203b6c66fda7..7da83311dcccfdc8d333093d6ef87a02728333de 100644 |
| --- a/webrtc/build/common.gypi |
| +++ b/webrtc/build/common.gypi |
| @@ -263,8 +263,29 @@ |
| ['build_with_chromium==1', { |
| 'defines': [ |
| # Changes settings for Chromium build. |
| - 'WEBRTC_CHROMIUM_BUILD', |
| + 'ENABLE_EXTERNAL_AUTH', |
| + 'EXPAT_RELATIVE_PATH', |
| + 'FEATURE_ENABLE_SSL', |
| + 'GTEST_RELATIVE_PATH', |
| + 'HAVE_OPENSSL_SSL_H', |
| + 'HAVE_SCTP', |
| + 'HAVE_SRTP', |
| + 'HAVE_WEBRTC_VIDEO', |
| + 'HAVE_WEBRTC_VOICE', |
| 'LOGGING_INSIDE_WEBRTC', |
| + 'NO_MAIN_THREAD_WRAPPING', |
| + 'NO_SOUND_SYSTEM', |
| + 'SRTP_RELATIVE_PATH', |
| + 'SSL_USE_OPENSSL', |
| + 'USE_WEBRTC_DEV_BRANCH', |
| + 'WEBRTC_CHROMIUM_BUILD', |
| + ], |
| + 'conditions': [ |
| + ['OS=="win" and target_arch=="ia32"', { |
| + 'defines': [ |
| + '_USE_32BIT_TIME_T', |
| + ], |
| + }], |
| ], |
| 'include_dirs': [ |
| # Include the top-level directory when building in Chrome, so we can |
| @@ -439,6 +460,21 @@ |
| }], |
| ], |
| }], |
| + ['chromeos==1', { |
| + 'defines': [ |
| + 'CHROMEOS', |
| + ], |
| + }], |
| + ['os_bsd==1', { |
| + 'defines': [ |
| + 'BSD', |
| + ], |
| + }], |
| + ['OS=="openbsd"', { |
| + 'defines': [ |
| + 'OPENBSD', |
| + ], |
| + }], |
| ['include_internal_audio_device==1', { |
| 'defines': [ |
| 'WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE', |
| @@ -456,6 +492,12 @@ |
| ['build_with_chromium==1', { |
| 'defines': [ |
| # Changes settings for Chromium build. |
| + 'FEATURE_ENABLE_SSL', |
| + 'FEATURE_ENABLE_VOICEMAIL', |
|
perkj_webrtc
2016/04/01 09:33:47
I don't think you need FEATURE_ENABLE_VOICEMAIL.
kjellander_webrtc
2016/04/01 10:34:36
Initially I did a lot of grepping to see which def
tommi
2016/04/01 13:23:09
wanna put down a todo so that it won't be forgotte
kjellander_webrtc
2016/04/04 07:11:59
Yepp, added TODOs in PS#3
|
| + 'EXPAT_RELATIVE_PATH', |
| + 'GTEST_RELATIVE_PATH', |
| + 'NO_MAIN_THREAD_WRAPPING', |
| + 'NO_SOUND_SYSTEM', |
| 'WEBRTC_CHROMIUM_BUILD', |
| ], |
| 'include_dirs': [ |
| @@ -483,6 +525,7 @@ |
| ['OS=="win"', { |
| 'defines': [ |
| 'WEBRTC_WIN', |
| + '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf |
|
perkj_webrtc
2016/04/01 09:33:47
git grep "_vsnprinf" returns nothing. Not needed a
kjellander_webrtc
2016/04/01 10:34:36
I don't know, I thought it may be used in system l
|
| ], |
| }], |
| ['OS=="linux"', { |
| @@ -503,6 +546,21 @@ |
| 'WEBRTC_POSIX', |
| ], |
| }], |
| + ['chromeos==1', { |
| + 'defines': [ |
| + 'CHROMEOS', |
| + ], |
| + }], |
| + ['os_bsd==1', { |
| + 'defines': [ |
| + 'BSD', |
| + ], |
| + }], |
| + ['OS=="openbsd"', { |
| + 'defines': [ |
| + 'OPENBSD', |
| + ], |
| + }], |
| ], |
| }, |
| }, # target_defaults |