summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-12-11 13:37:12 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-12-11 13:37:12 +0000
commitca63ad967487d69188a69cef2fce83ea3d6873f4 (patch)
tree0f087515a9cad68fc3177316bc43b6bc0c351048 /modules
parent1430bc30eb15a5c7236d32f3ec7d53be64ad3add (diff)
downloadwebrtc-ca63ad967487d69188a69cef2fce83ea3d6873f4.tar.gz
Roll chromium_revision 232627:238260
This brings us the updated swarming_client that has moved out from Chromium into a standalone project. Because of this, all .isolate files needed to be updated as well, similar to the changes in https://codereview.chromium.org/29993003 TEST=trybots passing BUG=none R=andrew@webrtc.org, perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/4859004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5260 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules')
-rw-r--r--modules/audio_coding/neteq/neteq_unittests.isolate3
-rw-r--r--modules/audio_coding/neteq4/audio_decoder_unittests.isolate3
-rw-r--r--modules/audio_device/android/test/project.properties4
-rw-r--r--modules/audio_device/audio_device_tests.isolate3
-rw-r--r--modules/modules_tests.isolate3
-rw-r--r--modules/modules_unittests.isolate3
-rw-r--r--modules/video_capture/video_capture_tests.isolate3
-rw-r--r--modules/video_render/video_render_tests.isolate3
8 files changed, 9 insertions, 16 deletions
diff --git a/modules/audio_coding/neteq/neteq_unittests.isolate b/modules/audio_coding/neteq/neteq_unittests.isolate
index 3e540c3e..e8f4e482 100644
--- a/modules/audio_coding/neteq/neteq_unittests.isolate
+++ b/modules/audio_coding/neteq/neteq_unittests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../../testing/test_env.py',
- '../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
@@ -37,7 +36,7 @@
'<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../../tools/swarm_client/',
+ '../../../../tools/swarming_client/',
],
},
}],
diff --git a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
index d2d858c5..bb57e74b 100644
--- a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
+++ b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../../testing/test_env.py',
- '../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
@@ -33,7 +32,7 @@
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../../tools/swarm_client/',
+ '../../../../tools/swarming_client/',
],
},
}],
diff --git a/modules/audio_device/android/test/project.properties b/modules/audio_device/android/test/project.properties
index dc510e30..8459f9b8 100644
--- a/modules/audio_device/android/test/project.properties
+++ b/modules/audio_device/android/test/project.properties
@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-17
+target=android-19
-java.compilerargs=-Xlint:all -Werror \ No newline at end of file
+java.compilerargs=-Xlint:all -Werror
diff --git a/modules/audio_device/audio_device_tests.isolate b/modules/audio_device/audio_device_tests.isolate
index 8f336cdb..69e877c1 100644
--- a/modules/audio_device/audio_device_tests.isolate
+++ b/modules/audio_device/audio_device_tests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
- '../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../tools/swarm_client/',
+ '../../../tools/swarming_client/',
],
},
}],
diff --git a/modules/modules_tests.isolate b/modules/modules_tests.isolate
index c24ff9c3..7a051f66 100644
--- a/modules/modules_tests.isolate
+++ b/modules/modules_tests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
- '../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -34,7 +33,7 @@
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../tools/swarm_client/',
+ '../../tools/swarming_client/',
],
},
}],
diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate
index 32fc6628..aa91238c 100644
--- a/modules/modules_unittests.isolate
+++ b/modules/modules_unittests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
- '../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -79,7 +78,7 @@
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../tools/swarm_client/',
+ '../../tools/swarming_client/',
],
},
}],
diff --git a/modules/video_capture/video_capture_tests.isolate b/modules/video_capture/video_capture_tests.isolate
index d07255f4..30374ce4 100644
--- a/modules/video_capture/video_capture_tests.isolate
+++ b/modules/video_capture/video_capture_tests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
- '../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../tools/swarm_client/',
+ '../../../tools/swarming_client/',
],
},
}],
diff --git a/modules/video_render/video_render_tests.isolate b/modules/video_render/video_render_tests.isolate
index faf03be3..397ec04e 100644
--- a/modules/video_render/video_render_tests.isolate
+++ b/modules/video_render/video_render_tests.isolate
@@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
- '../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../tools/swarm_client/',
+ '../../../tools/swarming_client/',
],
},
}],