Index: build/android/pylib/gtest/setup.py |
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py |
index f139c979081f2bd8c4841323414ddebe16e114d6..57f749cf54e2a5f3bf7520c843115952a0799825 100644 |
--- a/build/android/pylib/gtest/setup.py |
+++ b/build/android/pylib/gtest/setup.py |
@@ -33,7 +33,6 @@ _ISOLATE_FILE_PATHS = { |
'content_browsertests': 'content/content_browsertests.isolate', |
'content_unittests': 'content/content_unittests.isolate', |
'media_unittests': 'media/media_unittests.isolate', |
- 'modules_unittests': 'third_party/webrtc/modules/modules_unittests.isolate', |
'net_unittests': 'net/net_unittests.isolate', |
'ui_unittests': 'ui/ui_unittests.isolate', |
'unit_tests': 'chrome/unit_tests.isolate', |
@@ -41,6 +40,29 @@ _ISOLATE_FILE_PATHS = { |
'third_party/WebKit/Source/web/WebKitUnitTests.isolate', |
} |
+# Paths relative to third_party/webrtc/ (kept separate for readability). |
+_WEBRTC_ISOLATE_FILE_PATHS = { |
+ 'audio_decoder_unittests': |
+ 'modules/audio_coding/neteq4/audio_decoder_unittests.isolate', |
+ 'common_audio_unittests': 'common_audio/common_audio_unittests.isolate', |
+ 'common_video_unittests': 'common_video/common_video_unittests.isolate', |
+ 'metrics_unittests': 'test/metrics_unittests.isolate', |
+ 'modules_tests': 'modules/modules_tests.isolate', |
+ 'modules_unittests': 'modules/modules_unittests.isolate', |
+ 'neteq_unittests': 'modules/audio_coding/neteq/neteq_unittests.isolate', |
+ 'system_wrappers_unittests': |
+ 'system_wrappers/source/system_wrappers_unittests.isolate', |
+ 'test_support_unittests': 'test/test_support_unittests.isolate', |
+ 'tools_unittests': 'tools/tools_unittests.isolate', |
+ 'video_engine_core_unittests': |
+ 'video_engine/video_engine_core_unittests.isolate', |
+ 'voice_engine_unittests': 'voice_engine/voice_engine_unittests.isolate', |
+} |
+ |
+# Append the WebRTC tests with the full path from Chromium's src/ root. |
+for test,isolate_path in _WEBRTC_ISOLATE_FILE_PATHS.items(): |
frankf
2013/08/27 18:34:54
space after comma
|
+ _ISOLATE_FILE_PATHS[test] = 'third_party/webrtc/%s' % isolate_path |
+ |
# Used for filtering large data deps at a finer grain than what's allowed in |
# isolate files since pushing deps to devices is expensive. |
# Wildcards are allowed. |