From 499dcb1ac0b86d32da505f6174712f3379bbe1f6 Mon Sep 17 00:00:00 2001 From: kjellander Date: Fri, 9 Sep 2016 01:38:52 -0700 Subject: [PATCH] Remove references to .isolate files that are no longer needed. After the Android test framework in Chromium moved over to generated scripts, these paths are no longer used, so let's clean them up. BUG=webrtc:6323 NOTRY=True Review-Url: https://codereview.webrtc.org/2327013002 Cr-Commit-Position: refs/heads/master@{#14151} --- webrtc/build/android/test_runner.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py index fd8ca2fc07..f2bc801d20 100755 --- a/webrtc/build/android/test_runner.py +++ b/webrtc/build/android/test_runner.py @@ -20,41 +20,14 @@ import sys SCRIPT_DIR = os.path.dirname(__file__) SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir, - os.pardir)) + os.pardir)) CHROMIUM_BUILD_ANDROID_DIR = os.path.join(SRC_DIR, 'build', 'android') sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR) import test_runner # pylint: disable=W0406 -from pylib.gtest import gtest_test_instance def main(): - # Set our own paths to the .isolate files. - # pylint: disable=protected-access - gtest_test_instance._DEFAULT_ISOLATE_FILE_PATHS.update({ - 'audio_decoder_unittests': - 'webrtc/modules/audio_decoder_unittests.isolate', - 'common_audio_unittests': - 'webrtc/common_audio/common_audio_unittests.isolate', - 'common_video_unittests': - 'webrtc/common_video/common_video_unittests.isolate', - 'peerconnection_unittests': - 'webrtc/api/peerconnection_unittests.isolate', - 'modules_tests': 'webrtc/modules/modules_tests.isolate', - 'modules_unittests': 'webrtc/modules/modules_unittests.isolate', - 'rtc_unittests': 'webrtc/rtc_unittests.isolate', - 'system_wrappers_unittests': - 'webrtc/system_wrappers/system_wrappers_unittests.isolate', - 'test_support_unittests': 'webrtc/test/test_support_unittests.isolate', - 'tools_unittests': 'webrtc/tools/tools_unittests.isolate', - 'video_capture_tests': - 'webrtc/modules/video_capture/video_capture_tests.isolate', - 'video_engine_tests': 'webrtc/video_engine_tests.isolate', - 'voice_engine_unittests': - 'webrtc/voice_engine/voice_engine_unittests.isolate', - 'webrtc_nonparallel_tests': 'webrtc/webrtc_nonparallel_tests.isolate', - 'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate', - }) # Override environment variable to make it possible for the scripts to find # the root directory (our symlinking of the Chromium build toolchain would # otherwise make them fail to do so).