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

Side by Side Diff: talk/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 | « sync_chromium.py ('k') | webrtc/build/isolate.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2013 Google Inc. 3 # Copyright 2013 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 ], 116 ],
117 'conditions': [ 117 'conditions': [
118 # Note: When gyp merges lists, it appends them to the old value. 118 # Note: When gyp merges lists, it appends them to the old value.
119 ['OS=="mac"', { 119 ['OS=="mac"', {
120 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) 120 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
121 # form. 121 # form.
122 'action': [ 122 'action': [
123 '--extra-variable', 'mac_product_name', '<(mac_product_name)', 123 '--extra-variable', 'mac_product_name', '<(mac_product_name)',
124 ], 124 ],
125 }], 125 }],
126 ["test_isolation_outdir!=''", {
127 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
128 }],
129 ], 126 ],
130 }, 127 },
131 ], 128 ],
132 } 129 }
OLDNEW
« no previous file with comments | « sync_chromium.py ('k') | webrtc/build/isolate.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698