Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: scripts/slave/unittests/data/patch_path_filter/git_patch2.patch

Issue 505153002: WebRTC: Remove android_apk recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/unittests/data/patch_path_filter/git_patch2.patch
diff --git a/scripts/slave/unittests/data/patch_path_filter/git_patch2.patch b/scripts/slave/unittests/data/patch_path_filter/git_patch2.patch
deleted file mode 100644
index 368ed386dcff0c9999861b95d2ec9e900882382f..0000000000000000000000000000000000000000
--- a/scripts/slave/unittests/data/patch_path_filter/git_patch2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: .gitignore
-diff --git a/.gitignore b/.gitignore
-index 381acfac1f20140e75ad6e62f01342da0f172213..3ceaf9ce07e450cff79ceed706e7dfd64a7a437d 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -86,8 +86,7 @@
- /tools/gyp
- /tools/protoc_wrapper
- /tools/python
--/tools/sharding_supervisor
--/tools/swarm_client
-+/tools/swarming_client
- /tools/valgrind
- /tools/win
- /webrtc/modules/audio_device/android/test/bin/
-Index: talk/build/isolate.gypi
-diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi
-index 83dd502a6e66f012e23c8765f6a14781df85abaa..7b0ac1254d60495498930705b267c6a36b056eb1 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.
-Index: webrtc/build/common.gypi
-diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
-index c232f2b8f8c17c13979c5364dfedbe30f2188909..598a268e216b15d5d2eda19bf47928c4772183f7 100644
---- a/webrtc/build/common.gypi
-+++ b/webrtc/build/common.gypi
-@@ -175,6 +175,7 @@
- # that get overridden by -Wextra.
- '-Wno-unused-parameter',
- '-Wno-missing-field-initializers',
-+ '-Wno-strict-overflow',
- ],
- 'cflags_cc': [
- '-Wnon-virtual-dtor',
-Index: webrtc/common_audio/common_audio_unittests.isolate
-diff --git a/webrtc/common_audio/common_audio_unittests.isolate b/webrtc/common_audio/common_audio_unittests.isolate
-index ca4bee650813f15ce22500c2a483f9c89f6685f4..49f1e984b0e85079ac02071ec7efc5d3d3fec7f4 100644
---- a/webrtc/common_audio/common_audio_unittests.isolate
-+++ b/webrtc/common_audio/common_audio_unittests.isolate
-@@ -21,7 +21,6 @@
- 'variables': {
- 'command': [
- '../../testing/test_env.py',
-- '../../tools/swarm_client/googletest/run_test_cases.py',
- '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
- ],
- 'isolate_dependency_tracked': [
-@@ -29,7 +28,7 @@
- '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
- ],
- 'isolate_dependency_untracked': [
-- '../../tools/swarm_client/',
-+ '../../tools/swarming_client/',
- ],
- },
- }],

Powered by Google App Engine
This is Rietveld 408576698