Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Unified Diff: webrtc/build/common.gypi

Issue 1847013002: Set defines for Chromium build. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added TODOs Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/common.gypi
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 6ec0f1c9426b4105627d813e99fc203b6c66fda7..1afb8f695b1068fceb1222a093a626f182df1df6 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -263,8 +263,31 @@
['build_with_chromium==1', {
'defines': [
# Changes settings for Chromium build.
- 'WEBRTC_CHROMIUM_BUILD',
+ # TODO(kjellander): Cleanup unused ones and move defines closer to the
+ # source when webrtc:4256 is completed.
+ '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 +462,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 +494,14 @@
['build_with_chromium==1', {
'defines': [
# Changes settings for Chromium build.
+ # TODO(kjellander): Cleanup unused ones and move defines closer to
+ # the source when webrtc:4256 is completed.
+ 'FEATURE_ENABLE_SSL',
+ 'FEATURE_ENABLE_VOICEMAIL',
+ 'EXPAT_RELATIVE_PATH',
+ 'GTEST_RELATIVE_PATH',
+ 'NO_MAIN_THREAD_WRAPPING',
+ 'NO_SOUND_SYSTEM',
'WEBRTC_CHROMIUM_BUILD',
],
'include_dirs': [
@@ -483,6 +529,7 @@
['OS=="win"', {
'defines': [
'WEBRTC_WIN',
+ '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf
],
}],
['OS=="linux"', {
@@ -503,6 +550,21 @@
'WEBRTC_POSIX',
],
}],
+ ['chromeos==1', {
+ 'defines': [
+ 'CHROMEOS',
+ ],
+ }],
+ ['os_bsd==1', {
+ 'defines': [
+ 'BSD',
+ ],
+ }],
+ ['OS=="openbsd"', {
+ 'defines': [
+ 'OPENBSD',
+ ],
+ }],
],
},
}, # target_defaults
« no previous file with comments | « no previous file | webrtc/media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698