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

Side by Side Diff: webrtc/build/isolate.gypi

Issue 1182043002: Roll chromium_revision e937e5f..c2239a8 (333350:334133) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Trying new workaround for trybots Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « talk/build/isolate.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # Copied from Chromium's src/build/isolate.gypi 9 # Copied from Chromium's src/build/isolate.gypi
10 # 10 #
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ], 97 ],
98 'conditions': [ 98 'conditions': [
99 # Note: When gyp merges lists, it appends them to the old value. 99 # Note: When gyp merges lists, it appends them to the old value.
100 ['OS=="mac"', { 100 ['OS=="mac"', {
101 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) 101 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
102 # form. 102 # form.
103 'action': [ 103 'action': [
104 '--extra-variable', 'mac_product_name', '<(mac_product_name)', 104 '--extra-variable', 'mac_product_name', '<(mac_product_name)',
105 ], 105 ],
106 }], 106 }],
107 ["test_isolation_outdir!=''", {
108 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
109 }],
110 ], 107 ],
111 }, 108 },
112 ], 109 ],
113 } 110 }
OLDNEW
« no previous file with comments | « talk/build/isolate.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698