diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-27 12:10:09 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-27 12:10:09 +0000 |
| commit | 8c6633cef9dec285b483bf6a5bfd1e2236ce75e4 (patch) | |
| tree | 136fc7a292169eb5b2d3106a0bf44f660b092030 /voice_engine | |
| parent | 584b6885bd8cf5a64d18f9d50b4cdc4415651d78 (diff) | |
| download | webrtc-8c6633cef9dec285b483bf6a5bfd1e2236ce75e4.tar.gz | |
Add isolate configuration for Android for all tests.
In https://code.google.com/p/webrtc/source/detail?r=4407
henrike@ added the path to the WebRTC resources and
data directories for Android that are required in order to
use isolate for test execution on Android.
This CL adds similar entries to the rest of the .isolate
files added in
https://code.google.com/p/webrtc/source/detail?r=4590.
It also removes three accidentally added .isolate files that originated
from old test names:
* audio_device_test_api
* video_capture_module_test
* video_render_module_test
BUG=1882,1916
TEST=trybots passing.
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2107004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4627 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine')
| -rw-r--r-- | voice_engine/voe_auto_test.isolate | 10 | ||||
| -rw-r--r-- | voice_engine/voice_engine_unittests.isolate | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/voice_engine/voe_auto_test.isolate b/voice_engine/voe_auto_test.isolate index 465ec1a0..3401e3ff 100644 --- a/voice_engine/voe_auto_test.isolate +++ b/voice_engine/voe_auto_test.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { '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/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/voice_engine/voice_engine_unittests.isolate b/voice_engine/voice_engine_unittests.isolate index d90fa3c7..4c17afa6 100644 --- a/voice_engine/voice_engine_unittests.isolate +++ b/voice_engine/voice_engine_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { '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/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ |