diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-13 09:02:15 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-13 09:02:15 +0000 |
| commit | a1bfc50a725434ccb45f65e68ede5ea0085738da (patch) | |
| tree | c9c96615ec0ac112cc2558812d0c43d401725354 /webrtc/webrtc_perf_tests.isolate | |
| parent | c800c1cc4080275f81ea5378d2edeaad04564bc0 (diff) | |
| download | webrtc-a1bfc50a725434ccb45f65e68ede5ea0085738da.tar.gz | |
Pass GYP DEPTH variable to isolate.
Similar change to https://codereview.chromium.org/322403003/
This will make it possible to handle different
directory levels for special builds of WebRTC, without
breaking GYP when the .isolate files are processed and
their contents is verified.
Also update all our .isolate files to use the <(DEPTH)
variable.
BUG=343106
TEST=Successful compile+test on Linux using:
ninja -C out/Release
tools/swarming_client/isolate.py run -s out/Release/tools_unittests.isolated
Also trybots passing all tests.
R=pbos@webrtc.org
TBR=tina.legrand@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13679004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6427 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/webrtc_perf_tests.isolate')
| -rw-r--r-- | webrtc/webrtc_perf_tests.isolate | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/webrtc/webrtc_perf_tests.isolate b/webrtc/webrtc_perf_tests.isolate index 4ff16735a3..b39c83df34 100644 --- a/webrtc/webrtc_perf_tests.isolate +++ b/webrtc/webrtc_perf_tests.isolate @@ -8,12 +8,10 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../data/', - '../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], @@ -23,14 +21,14 @@ '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../DEPS', - '../resources/foreman_cif.yuv', - '../resources/paris_qcif.yuv', - '../resources/voice_engine/audio_long16.pcm', + '<(DEPTH)/DEPS', + '<(DEPTH)/resources/foreman_cif.yuv', + '<(DEPTH)/resources/paris_qcif.yuv', + '<(DEPTH)/resources/voice_engine/audio_long16.pcm', '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], |