Move include_tests to a higher variable nesting.
TBR=wu@webrtc.org BUG=none TEST=trybots Review URL: https://webrtc-codereview.appspot.com/734004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2587 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
b20916e336
commit
54da26d2d2
@ -31,18 +31,9 @@
|
||||
'build_with_chromium%': '<(build_with_chromium)',
|
||||
'webrtc_root%': '<(webrtc_root)',
|
||||
|
||||
'conditions': [
|
||||
['build_with_chromium==1', {
|
||||
'include_tests%': 0,
|
||||
}, {
|
||||
'include_tests%': 1,
|
||||
}],
|
||||
],
|
||||
|
||||
'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
|
||||
},
|
||||
'build_with_chromium%': '<(build_with_chromium)',
|
||||
'include_tests%': '<(include_tests)',
|
||||
'webrtc_root%': '<(webrtc_root)',
|
||||
'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
|
||||
|
||||
@ -93,20 +84,18 @@
|
||||
|
||||
'include_video_engine_file_api%': 0,
|
||||
|
||||
'include_tests%': 0,
|
||||
|
||||
# Disable the use of protocol buffers in production code.
|
||||
'enable_protobuf%': 0,
|
||||
}, { # Settings for the standalone (not-in-Chromium) build.
|
||||
'include_pulse_audio%': 1,
|
||||
|
||||
'include_internal_audio_device%': 1,
|
||||
|
||||
'include_internal_video_capture%': 1,
|
||||
|
||||
'include_internal_video_render%': 1,
|
||||
|
||||
'include_video_engine_file_api%': 1,
|
||||
|
||||
'enable_protobuf%': 1,
|
||||
'include_tests%': 1,
|
||||
|
||||
# TODO(andrew): For now, disable the Chrome plugins, which causes a
|
||||
# flood of chromium-style warnings. Investigate enabling them:
|
||||
|
18
webrtc.gyp
18
webrtc.gyp
@ -18,15 +18,6 @@
|
||||
'src/voice_engine/voice_engine.gyp:*',
|
||||
'<(webrtc_vp8_dir)/vp8.gyp:*',
|
||||
],
|
||||
'conditions': [
|
||||
['include_tests==1', {
|
||||
'webrtc_all_dependencies': [
|
||||
'src/test/metrics.gyp:*',
|
||||
'src/test/test.gyp:*',
|
||||
'tools/e2e_quality/e2e_quality.gyp:*',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
'targets': [
|
||||
{
|
||||
@ -35,6 +26,15 @@
|
||||
'dependencies': [
|
||||
'<@(webrtc_all_dependencies)',
|
||||
],
|
||||
'conditions': [
|
||||
['include_tests==1', {
|
||||
'dependencies': [
|
||||
'src/test/metrics.gyp:*',
|
||||
'src/test/test.gyp:*',
|
||||
'tools/e2e_quality/e2e_quality.gyp:*',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user