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@5260 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi
index 83dd502..7b0ac12 100644
--- a/talk/build/isolate.gypi
+++ b/talk/build/isolate.gypi
@@ -71,9 +71,9 @@
'extension': 'isolate',
'inputs': [
# Files that are known to be involved in this step.
- '<(DEPTH)/tools/swarm_client/isolate.py',
- '<(DEPTH)/tools/swarm_client/run_isolated.py',
- '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
+ '<(DEPTH)/tools/swarming_client/isolate.py',
+ '<(DEPTH)/tools/swarming_client/run_isolated.py',
+ '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
# Disable file tracking by the build driver for now. This means the
# project must have the proper build-time dependency for their runtime
@@ -94,7 +94,7 @@
["test_isolation_outdir==''", {
'action': [
'python',
- '<(DEPTH)/tools/swarm_client/isolate.py',
+ '<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
# GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
# be provided twice. To work around this behavior, append '/'.
@@ -114,7 +114,7 @@
}, {
'action': [
'python',
- '<(DEPTH)/tools/swarm_client/isolate.py',
+ '<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
# See comment above.
diff --git a/talk/examples/android/project.properties b/talk/examples/android/project.properties
index bc163b0..8459f9b 100644
--- a/talk/examples/android/project.properties
+++ b/talk/examples/android/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
diff --git a/talk/libjingle_media_unittest.isolate b/talk/libjingle_media_unittest.isolate
index 4c4ee31..36b50b5 100644
--- a/talk/libjingle_media_unittest.isolate
+++ b/talk/libjingle_media_unittest.isolate
@@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
- '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -39,7 +38,7 @@
'<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../tools/swarm_client/',
+ '../tools/swarming_client/',
],
},
}],
diff --git a/talk/libjingle_p2p_unittest.isolate b/talk/libjingle_p2p_unittest.isolate
index 848f234..b5ad4ff 100644
--- a/talk/libjingle_p2p_unittest.isolate
+++ b/talk/libjingle_p2p_unittest.isolate
@@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
- '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../tools/swarm_client/',
+ '../tools/swarming_client/',
],
},
}],
diff --git a/talk/libjingle_peerconnection_unittest.isolate b/talk/libjingle_peerconnection_unittest.isolate
index 660ffd5..e7dd687 100644
--- a/talk/libjingle_peerconnection_unittest.isolate
+++ b/talk/libjingle_peerconnection_unittest.isolate
@@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
- '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../tools/swarm_client/',
+ '../tools/swarming_client/',
],
},
}],
diff --git a/talk/libjingle_sound_unittest.isolate b/talk/libjingle_sound_unittest.isolate
index 6da7d88..7166337 100644
--- a/talk/libjingle_sound_unittest.isolate
+++ b/talk/libjingle_sound_unittest.isolate
@@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
- '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../tools/swarm_client/',
+ '../tools/swarming_client/',
],
},
}],
diff --git a/talk/libjingle_unittest.isolate b/talk/libjingle_unittest.isolate
index efb8625..e678af0 100644
--- a/talk/libjingle_unittest.isolate
+++ b/talk/libjingle_unittest.isolate
@@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
- '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../tools/swarm_client/',
+ '../tools/swarming_client/',
],
},
}],