From 78c222bfae49603532be53097cca10225738b79c Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 31 Oct 2014 18:08:09 +0000 Subject: [PATCH] Update all .isolate files for the new format. R=kjellander@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/27809004 Patch from Marc-Antoine Ruel . git-svn-id: http://webrtc.googlecode.com/svn/trunk@7583 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/build/isolate.gypi | 12 ------------ talk/libjingle_media_unittest.isolate | 7 ++----- talk/libjingle_p2p_unittest.isolate | 5 +---- talk/libjingle_peerconnection_unittest.isolate | 5 +---- talk/libjingle_sound_unittest.isolate | 5 +---- talk/libjingle_tests.gyp | 3 --- talk/libjingle_unittest.isolate | 5 +---- webrtc/build/isolate.gypi | 12 ------------ webrtc/common_audio/common_audio.gyp | 1 - .../common_audio/common_audio_unittests.isolate | 7 ++----- webrtc/common_video/common_video_unittests.gyp | 1 - .../common_video/common_video_unittests.isolate | 7 ++----- .../codecs/tools/audio_codec_speed_tests.gypi | 1 - .../tools/audio_codec_speed_tests.isolate | 9 ++------- .../neteq/audio_decoder_unittests.isolate | 9 ++------- webrtc/modules/audio_coding/neteq/neteq.gypi | 1 - webrtc/modules/audio_device/audio_device.gypi | 1 - .../audio_device/audio_device_tests.isolate | 7 ++----- webrtc/modules/modules.gyp | 2 -- webrtc/modules/modules_tests.isolate | 7 ++----- webrtc/modules/modules_unittests.isolate | 13 ++----------- webrtc/modules/video_capture/video_capture.gypi | 17 ++++++++--------- .../video_capture/video_capture_tests.isolate | 7 ++----- webrtc/modules/video_render/video_render.gypi | 1 - .../video_render/video_render_tests.isolate | 7 ++----- webrtc/rtc_unittests.isolate | 5 +---- .../source/system_wrappers_tests.gyp | 1 - .../source/system_wrappers_unittests.isolate | 7 ++----- webrtc/test/test.gyp | 1 - webrtc/test/test_support_unittests.isolate | 7 ++----- webrtc/tools/tools.gyp | 1 - webrtc/tools/tools_unittests.isolate | 7 ++----- .../test/auto_test/vie_auto_test.gypi | 1 - .../test/auto_test/vie_auto_test.isolate | 9 ++------- webrtc/video_engine/video_engine_core.gypi | 3 +-- .../video_engine_core_unittests.isolate | 7 ++----- webrtc/video_engine_tests.isolate | 7 ++----- webrtc/voice_engine/voe_auto_test.isolate | 7 ++----- webrtc/voice_engine/voice_engine.gyp | 2 -- .../voice_engine/voice_engine_unittests.isolate | 7 ++----- webrtc/webrtc_perf_tests.isolate | 7 ++----- webrtc/webrtc_tests.gypi | 3 --- 42 files changed, 52 insertions(+), 182 deletions(-) diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi index 6f884cf68d..df28525696 100644 --- a/talk/build/isolate.gypi +++ b/talk/build/isolate.gypi @@ -81,18 +81,6 @@ # Files that are known to be involved in this step. '<(DEPTH)/tools/swarming_client/isolate.py', '<(DEPTH)/tools/swarming_client/run_isolated.py', - - # Disable file tracking by the build driver for now. This means the - # project must have the proper build-time dependency for their runtime - # dependency. This improves the runtime of the build driver since it - # doesn't have to stat() all these files. - # - # More importantly, it means that even if a isolate_dependency_tracked - # file is missing, for example if a file was deleted and the .isolate - # file was not updated, that won't break the build, especially in the - # case where foo_tests_run is not built! This should be reenabled once - # the switch-over to running tests on Swarm is completed. - #'<@(isolate_dependency_tracked)', ], 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', diff --git a/talk/libjingle_media_unittest.isolate b/talk/libjingle_media_unittest.isolate index 666478b438..970a166661 100644 --- a/talk/libjingle_media_unittest.isolate +++ b/talk/libjingle_media_unittest.isolate @@ -31,12 +31,9 @@ 'command': [ '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ - 'media/testdata/captured-320x240-2s-48.frames', + 'files': [ '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', + 'media/testdata/captured-320x240-2s-48.frames', ], }, }], diff --git a/talk/libjingle_p2p_unittest.isolate b/talk/libjingle_p2p_unittest.isolate index 9ff0d77ad6..d9f0423421 100644 --- a/talk/libjingle_p2p_unittest.isolate +++ b/talk/libjingle_p2p_unittest.isolate @@ -31,12 +31,9 @@ 'command': [ '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/talk/libjingle_peerconnection_unittest.isolate b/talk/libjingle_peerconnection_unittest.isolate index df07d4a9de..4bc8c43b8f 100644 --- a/talk/libjingle_peerconnection_unittest.isolate +++ b/talk/libjingle_peerconnection_unittest.isolate @@ -31,12 +31,9 @@ 'command': [ '<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/talk/libjingle_sound_unittest.isolate b/talk/libjingle_sound_unittest.isolate index 728e810418..b5342000f6 100644 --- a/talk/libjingle_sound_unittest.isolate +++ b/talk/libjingle_sound_unittest.isolate @@ -31,12 +31,9 @@ 'command': [ '<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index 4443f40e12..6a25c0f1aa 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -402,7 +402,6 @@ ], 'includes': [ 'build/isolate.gypi', - 'libjingle_media_unittest.isolate', ], 'sources': [ 'libjingle_media_unittest.isolate', @@ -416,7 +415,6 @@ ], 'includes': [ 'build/isolate.gypi', - 'libjingle_p2p_unittest.isolate', ], 'sources': [ 'libjingle_p2p_unittest.isolate', @@ -430,7 +428,6 @@ ], 'includes': [ 'build/isolate.gypi', - 'libjingle_peerconnection_unittest.isolate', ], 'sources': [ 'libjingle_peerconnection_unittest.isolate', diff --git a/talk/libjingle_unittest.isolate b/talk/libjingle_unittest.isolate index 0507f6a8ee..9313bebe90 100644 --- a/talk/libjingle_unittest.isolate +++ b/talk/libjingle_unittest.isolate @@ -31,12 +31,9 @@ 'command': [ '<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/build/isolate.gypi b/webrtc/build/isolate.gypi index 2e86020e48..86169fd094 100644 --- a/webrtc/build/isolate.gypi +++ b/webrtc/build/isolate.gypi @@ -62,18 +62,6 @@ # Files that are known to be involved in this step. '<(DEPTH)/tools/swarming_client/isolate.py', '<(DEPTH)/tools/swarming_client/run_isolated.py', - - # Disable file tracking by the build driver for now. This means the - # project must have the proper build-time dependency for their runtime - # dependency. This improves the runtime of the build driver since it - # doesn't have to stat() all these files. - # - # More importantly, it means that even if a isolate_dependency_tracked - # file is missing, for example if a file was deleted and the .isolate - # file was not updated, that won't break the build, especially in the - # case where foo_tests_run is not built! This should be reenabled once - # the switch-over to running tests on Swarm is completed. - #'<@(isolate_dependency_tracked)', ], 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 0eb238f8fa..ca77ba8f38 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -285,7 +285,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'common_audio_unittests.isolate', ], 'sources': [ 'common_audio_unittests.isolate', diff --git a/webrtc/common_audio/common_audio_unittests.isolate b/webrtc/common_audio/common_audio_unittests.isolate index cc5e6ab458..80eb0fc4a4 100644 --- a/webrtc/common_audio/common_audio_unittests.isolate +++ b/webrtc/common_audio/common_audio_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)/common_audio_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp index 0405ba0ef0..9189991ee4 100644 --- a/webrtc/common_video/common_video_unittests.gyp +++ b/webrtc/common_video/common_video_unittests.gyp @@ -60,7 +60,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'common_video_unittests.isolate', ], 'sources': [ 'common_video_unittests.isolate', diff --git a/webrtc/common_video/common_video_unittests.isolate b/webrtc/common_video/common_video_unittests.isolate index d33366c27e..7082365475 100644 --- a/webrtc/common_video/common_video_unittests.isolate +++ b/webrtc/common_video/common_video_unittests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,15 +21,12 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/DEPS', '<(DEPTH)/resources/foreman_cif.yuv', '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi index 6503a51e52..a9a5bb9438 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi @@ -55,7 +55,6 @@ ], 'includes': [ '../../../../build/isolate.gypi', - 'audio_codec_speed_tests.isolate', ], 'sources': [ 'audio_codec_speed_tests.isolate', diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate index 8c5a2bd0ec..ed7599d737 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/resources/', '<(DEPTH)/data/', ], @@ -21,19 +21,14 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_touched': [ + 'files': [ '<(DEPTH)/DEPS', - ], - 'isolate_dependency_tracked': [ '<(DEPTH)/resources/audio_coding/music_stereo_48kHz.pcm', '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm', '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate index e4a18ca841..f10b327b7b 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/resources/', '<(DEPTH)/data/', ], @@ -21,17 +21,12 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_touched': [ + 'files': [ '<(DEPTH)/DEPS', - ], - 'isolate_dependency_tracked': [ '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi index 73cb0eb35f..c68651d6de 100644 --- a/webrtc/modules/audio_coding/neteq/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -225,7 +225,6 @@ ], 'includes': [ '../../../build/isolate.gypi', - 'audio_decoder_unittests.isolate', ], 'sources': [ 'audio_decoder_unittests.isolate', diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index 23f417f9bb..add3be2a09 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -260,7 +260,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'audio_device_tests.isolate', ], 'sources': [ 'audio_device_tests.isolate', diff --git a/webrtc/modules/audio_device/audio_device_tests.isolate b/webrtc/modules/audio_device/audio_device_tests.isolate index ebe8bfb40b..a3550b793e 100644 --- a/webrtc/modules/audio_device/audio_device_tests.isolate +++ b/webrtc/modules/audio_device/audio_device_tests.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)/audio_device_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index f1d9df9b7a..6d0de1e2cf 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -397,7 +397,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'modules_tests.isolate', ], 'sources': [ 'modules_tests.isolate', @@ -411,7 +410,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'modules_unittests.isolate', ], 'sources': [ 'modules_unittests.isolate', diff --git a/webrtc/modules/modules_tests.isolate b/webrtc/modules/modules_tests.isolate index e5055f0d91..c29c65b75f 100644 --- a/webrtc/modules/modules_tests.isolate +++ b/webrtc/modules/modules_tests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,7 +21,7 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/DEPS', '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm', @@ -30,9 +30,6 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate index 09ace1c181..967ff32f6e 100644 --- a/webrtc/modules/modules_unittests.isolate +++ b/webrtc/modules/modules_unittests.isolate @@ -9,16 +9,10 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], - 'isolate_dependency_tracked': [ - '<(DEPTH)/resources/short_mixed_mono_48.dat', - '<(DEPTH)/resources/short_mixed_mono_48.pcm', - '<(DEPTH)/resources/short_mixed_stereo_48.dat', - '<(DEPTH)/resources/short_mixed_stereo_48.pcm', - ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { @@ -27,7 +21,7 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/DEPS', '<(DEPTH)/data/audio_processing/output_data_float.pb', '<(DEPTH)/data/voice_engine/audio_tiny48.wav', @@ -105,9 +99,6 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index 888d7727b6..22b8e02c4a 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -161,7 +161,7 @@ 'type': '<(gtest_target_type)', 'dependencies': [ 'video_capture_module', - 'video_capture_module_internal_impl', + 'video_capture_module_internal_impl', 'webrtc_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -192,13 +192,13 @@ 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], - # Need to disable error due to the line in - # base/android/jni_android.h triggering it: - # const BASE_EXPORT jobject GetApplicationContext() - # error: type qualifiers ignored on function return type - 'cflags': [ - '-Wno-ignored-qualifiers', - ], + # Need to disable error due to the line in + # base/android/jni_android.h triggering it: + # const BASE_EXPORT jobject GetApplicationContext() + # error: type qualifiers ignored on function return type + 'cflags': [ + '-Wno-ignored-qualifiers', + ], }], ['OS=="mac"', { 'dependencies': [ @@ -243,7 +243,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'video_capture_tests.isolate', ], 'sources': [ 'video_capture_tests.isolate', diff --git a/webrtc/modules/video_capture/video_capture_tests.isolate b/webrtc/modules/video_capture/video_capture_tests.isolate index 57dd66739f..be104376c2 100644 --- a/webrtc/modules/video_capture/video_capture_tests.isolate +++ b/webrtc/modules/video_capture/video_capture_tests.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)/video_capture_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 5db851d9c6..38a7798560 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -205,7 +205,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'video_render_tests.isolate', ], 'sources': [ 'video_render_tests.isolate', diff --git a/webrtc/modules/video_render/video_render_tests.isolate b/webrtc/modules/video_render/video_render_tests.isolate index 15c80141dc..12bfecf978 100644 --- a/webrtc/modules/video_render/video_render_tests.isolate +++ b/webrtc/modules/video_render/video_render_tests.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)/video_render_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/rtc_unittests.isolate b/webrtc/rtc_unittests.isolate index 7bcfc8548d..6dfe38d465 100644 --- a/webrtc/rtc_unittests.isolate +++ b/webrtc/rtc_unittests.isolate @@ -12,12 +12,9 @@ 'command': [ '<(PRODUCT_DIR)/rtc_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/rtc_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/system_wrappers/source/system_wrappers_tests.gyp b/webrtc/system_wrappers/source/system_wrappers_tests.gyp index f77b985a22..1877592065 100644 --- a/webrtc/system_wrappers/source/system_wrappers_tests.gyp +++ b/webrtc/system_wrappers/source/system_wrappers_tests.gyp @@ -80,7 +80,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'system_wrappers_unittests.isolate', ], 'sources': [ 'system_wrappers_unittests.isolate', diff --git a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate index f505771022..0a56470ccf 100644 --- a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate +++ b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate @@ -10,7 +10,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -22,13 +22,10 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index 51864331ee..5c959b9eaa 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -224,7 +224,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'test_support_unittests.isolate', ], 'sources': [ 'test_support_unittests.isolate', diff --git a/webrtc/test/test_support_unittests.isolate b/webrtc/test/test_support_unittests.isolate index 08bd4a4a1a..c1419e7e60 100644 --- a/webrtc/test/test_support_unittests.isolate +++ b/webrtc/test/test_support_unittests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,14 +21,11 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/DEPS', '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index 04acac3c23..102ba8ec30 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -165,7 +165,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'tools_unittests.isolate', ], 'sources': [ 'tools_unittests.isolate', diff --git a/webrtc/tools/tools_unittests.isolate b/webrtc/tools/tools_unittests.isolate index 1806574955..bf1fd0199a 100644 --- a/webrtc/tools/tools_unittests.isolate +++ b/webrtc/tools/tools_unittests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,15 +21,12 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/DEPS', '<(DEPTH)/resources/foreman_cif.yuv', '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.gypi b/webrtc/video_engine/test/auto_test/vie_auto_test.gypi index 1fb7e2f3a1..c8886d8f5e 100644 --- a/webrtc/video_engine/test/auto_test/vie_auto_test.gypi +++ b/webrtc/video_engine/test/auto_test/vie_auto_test.gypi @@ -137,7 +137,6 @@ ], 'includes': [ '../../../build/isolate.gypi', - 'vie_auto_test.isolate', ], 'sources': [ 'vie_auto_test.isolate', diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate index 762a7ac5a0..da09a6e5b7 100644 --- a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate +++ b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -21,16 +21,11 @@ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_touched': [ + 'files': [ '<(DEPTH)/DEPS', - ], - 'isolate_dependency_tracked': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/video_engine/video_engine_core.gypi b/webrtc/video_engine/video_engine_core.gypi index fd61043e22..2bfc6536d8 100644 --- a/webrtc/video_engine/video_engine_core.gypi +++ b/webrtc/video_engine/video_engine_core.gypi @@ -123,7 +123,7 @@ 'dependencies': [ 'video_engine_core', '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', - '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl', + '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gmock.gyp:gmock', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -168,7 +168,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'video_engine_core_unittests.isolate', ], 'sources': [ 'video_engine_core_unittests.isolate', diff --git a/webrtc/video_engine/video_engine_core_unittests.isolate b/webrtc/video_engine/video_engine_core_unittests.isolate index ec65e73994..b95d84c45c 100644 --- a/webrtc/video_engine/video_engine_core_unittests.isolate +++ b/webrtc/video_engine/video_engine_core_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)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/video_engine_tests.isolate b/webrtc/video_engine_tests.isolate index 40454bd61b..fc840829b9 100644 --- a/webrtc/video_engine_tests.isolate +++ b/webrtc/video_engine_tests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -20,14 +20,11 @@ 'command': [ '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(DEPTH)/DEPS', '<(DEPTH)/resources/foreman_cif_short.yuv', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/voice_engine/voe_auto_test.isolate b/webrtc/voice_engine/voe_auto_test.isolate index 3722b7d764..c13110e718 100644 --- a/webrtc/voice_engine/voe_auto_test.isolate +++ b/webrtc/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/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index 252afde2ce..83b356d719 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/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/webrtc/voice_engine/voice_engine_unittests.isolate b/webrtc/voice_engine/voice_engine_unittests.isolate index 02356804b9..4cd1f907e3 100644 --- a/webrtc/voice_engine/voice_engine_unittests.isolate +++ b/webrtc/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/', - ], }, }], ], diff --git a/webrtc/webrtc_perf_tests.isolate b/webrtc/webrtc_perf_tests.isolate index b39c83df34..2c547be546 100644 --- a/webrtc/webrtc_perf_tests.isolate +++ b/webrtc/webrtc_perf_tests.isolate @@ -9,7 +9,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(DEPTH)/data/', '<(DEPTH)/resources/', ], @@ -20,16 +20,13 @@ 'command': [ '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(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': [ - '<(DEPTH)/tools/swarming_client/', - ], }, }], ], diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 33e50e706a..33e509fa05 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -175,7 +175,6 @@ ], 'includes': [ 'build/isolate.gypi', - 'rtc_unittests.isolate', ], 'sources': [ 'rtc_unittests.isolate', @@ -189,7 +188,6 @@ ], 'includes': [ 'build/isolate.gypi', - 'video_engine_tests.isolate', ], 'sources': [ 'video_engine_tests.isolate', @@ -203,7 +201,6 @@ ], 'includes': [ 'build/isolate.gypi', - 'webrtc_perf_tests.isolate', ], 'sources': [ 'webrtc_perf_tests.isolate',