diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 15:21:41 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 15:21:41 +0000 |
| commit | 6651f18386d5bd9870d621ace2a11dec1cb68c80 (patch) | |
| tree | 940b095a69f4c43993cdf329d0aa6a8702b9ab3d /voice_engine | |
| parent | 2dc72e3be449734e64ff706df1765ac1bfe64b23 (diff) | |
| parent | a1fd19c12e4efdf4b8a5f92323070443d50dc34e (diff) | |
| download | webrtc-6651f18386d5bd9870d621ace2a11dec1cb68c80.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at a1fd19c12e4efdf4b8a5f92323070443d50dc34e
This commit was generated by merge_from_chromium.py.
Change-Id: Ibd48eca2d93e6324a2e886e451f27307aab45e9b
Diffstat (limited to 'voice_engine')
| -rw-r--r-- | voice_engine/voe_auto_test.isolate | 7 | ||||
| -rw-r--r-- | voice_engine/voice_engine.gyp | 2 | ||||
| -rw-r--r-- | voice_engine/voice_engine_unittests.isolate | 7 |
3 files changed, 4 insertions, 12 deletions
diff --git a/voice_engine/voe_auto_test.isolate b/voice_engine/voe_auto_test.isolate index 3722b7d7..c13110e7 100644 --- a/voice_engine/voe_auto_test.isolate +++ b/voice_engine/voe_auto_test.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,13 +21,10 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/voice_engine/voice_engine.gyp b/voice_engine/voice_engine.gyp index 252afde2..83b356d7 100644 --- a/voice_engine/voice_engine.gyp +++ b/voice_engine/voice_engine.gyp @@ -293,7 +293,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'voice_engine_unittests.isolate', ], 'sources': [ 'voice_engine_unittests.isolate', @@ -307,7 +306,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'voe_auto_test.isolate', ], 'sources': [ 'voe_auto_test.isolate', diff --git a/voice_engine/voice_engine_unittests.isolate b/voice_engine/voice_engine_unittests.isolate index 02356804..4cd1f907 100644 --- a/voice_engine/voice_engine_unittests.isolate +++ b/voice_engine/voice_engine_unittests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,13 +21,10 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], |