zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't target top-level test gyps if include_tests==0

Browse Source 
Also add the possibility to pass a flag to the gyp run during gclient hooks.

Review URL: https://webrtc-codereview.appspot.com/729004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2582 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2012-08-09 17:37:03 +00:00
parent 48cf686933
commit ea5d0e5162
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -4,6 +4,7 @@ vars = {
# Override root_dir in your .gclient's custom_vars to specify a custom root # Override root_dir in your .gclient's custom_vars to specify a custom root
# folder name. # folder name.
"root_dir": "trunk", "root_dir": "trunk",
"extra_gyp_flag": "-Dextra_gyp_flag=0",
# Use this googlecode_url variable only if there is an internal mirror for it. # Use this googlecode_url variable only if there is an internal mirror for it.
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
@ -121,7 +122,8 @@ hooks = [
# A change to a .gyp, .gypi, or to GYP itself should run the generator. # A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".", "pattern": ".",
"action": ["python", Var("root_dir") + "/build/gyp_chromium", "action": ["python", Var("root_dir") + "/build/gyp_chromium",
"--depth=" + Var("root_dir"), Var("root_dir") + "/webrtc.gyp"], "--depth=" + Var("root_dir"), Var("root_dir") + "/webrtc.gyp",
Var("extra_gyp_flag")],
}, },
] ]

12
webrtc.gyp
View File

@ -19,11 +19,17 @@
'src/system_wrappers/source/system_wrappers.gyp:*', 'src/system_wrappers/source/system_wrappers.gyp:*',
'src/video_engine/video_engine.gyp:*', 'src/video_engine/video_engine.gyp:*',
'src/voice_engine/voice_engine.gyp:*', 'src/voice_engine/voice_engine.gyp:*',
'src/test/metrics.gyp:*',
'src/test/test.gyp:*',
'tools/e2e_quality/e2e_quality.gyp:*',
'<(webrtc_vp8_dir)/vp8.gyp:*' '<(webrtc_vp8_dir)/vp8.gyp:*'
], ],
'conditions': [
['include_tests==1', {
'dependencies': [
'src/test/metrics.gyp:*',
'src/test/test.gyp:*',
'tools/e2e_quality/e2e_quality.gyp:*',
],
}],
],
}, },
], ],
} }