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

Side by Side Diff: DEPS

Issue 1323243006: Roll WebRTC 10010:10022, Libjingle 10011:10022 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed DEPS that were being unintentionally modified by git merge Created 5 years, 3 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 | « no previous file | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This file is used to manage the dependencies of the Chromium src repo. It is 1 # This file is used to manage the dependencies of the Chromium src repo. It is
2 # used by gclient to determine what version of each dependency to check out, and 2 # used by gclient to determine what version of each dependency to check out, and
3 # where. 3 # where.
4 # 4 #
5 # For more information, please refer to the official documentation: 5 # For more information, please refer to the official documentation:
6 # https://sites.google.com/a/chromium.org/dev/developers/how-tos/get-the-code 6 # https://sites.google.com/a/chromium.org/dev/developers/how-tos/get-the-code
7 # 7 #
8 # When adding a new dependency, please update the top-level .gitignore file 8 # When adding a new dependency, please update the top-level .gitignore file
9 # to list the dependency's destination directory. 9 # to list the dependency's destination directory.
10 # 10 #
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 'src/third_party/libvpx': 188 'src/third_party/libvpx':
189 Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revisi on'), 189 Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revisi on'),
190 190
191 'src/third_party/libvpx_new/source/libvpx': 191 'src/third_party/libvpx_new/source/libvpx':
192 Var('chromium_git') + '/webm/libvpx.git' + '@' + 'c5f11912ae328a912ef087fdcd 074ff07e96d8f9', 192 Var('chromium_git') + '/webm/libvpx.git' + '@' + 'c5f11912ae328a912ef087fdcd 074ff07e96d8f9',
193 193
194 'src/third_party/ffmpeg': 194 'src/third_party/ffmpeg':
195 Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '382b031ebab 06b25df0708dd44aafad235657d2c', 195 Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '382b031ebab 06b25df0708dd44aafad235657d2c',
196 196
197 'src/third_party/libjingle/source/talk': 197 'src/third_party/libjingle/source/talk':
198 Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '300c7492bf1 d44614047e24a453a1f13a9c9719d', # commit position 10011 198 Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '228d997b9a6 0b755dbc985b78b3053dc461b4be7', # commit position 10022
199 199
200 'src/third_party/usrsctp/usrsctplib': 200 'src/third_party/usrsctp/usrsctplib':
201 Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408 f8f587cb4c3ffeef2e50ac', # from svn revision 9215 201 Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408 f8f587cb4c3ffeef2e50ac', # from svn revision 9215
202 202
203 'src/third_party/libsrtp': 203 'src/third_party/libsrtp':
204 Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '502e81a238a864cfc e774d4de3893810629bf227', # from svn revision 295151 204 Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '502e81a238a864cfc e774d4de3893810629bf227', # from svn revision 295151
205 205
206 'src/third_party/yasm/source/patched-yasm': 206 'src/third_party/yasm/source/patched-yasm':
207 Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120 cd8558ce62ee8672ebf3eb6f5216f909b', 207 Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120 cd8558ce62ee8672ebf3eb6f5216f909b',
208 208
209 'src/third_party/libjpeg_turbo': 209 'src/third_party/libjpeg_turbo':
210 Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'e4e75037f29 745f1546b6ebf5cf532e841c04c2c', 210 Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'e4e75037f29 745f1546b6ebf5cf532e841c04c2c',
211 211
212 'src/third_party/flac': 212 'src/third_party/flac':
213 Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '2c4b86af352b23498315 c016dc207e3fb2733fc0', 213 Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '2c4b86af352b23498315 c016dc207e3fb2733fc0',
214 214
215 'src/third_party/pyftpdlib/src': 215 'src/third_party/pyftpdlib/src':
216 Var('chromium_git') + '/external/pyftpdlib.git' + '@' + '2be6d65e31c7ee6320d 059f581f05ae8d89d7e45', 216 Var('chromium_git') + '/external/pyftpdlib.git' + '@' + '2be6d65e31c7ee6320d 059f581f05ae8d89d7e45',
217 217
218 'src/third_party/scons-2.0.1': 218 'src/third_party/scons-2.0.1':
219 Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 219 Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
220 220
221 'src/third_party/webrtc': 221 'src/third_party/webrtc':
222 Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'ea85c10a4 28fd5f038e969e00833dd4b1a96e1f7', # commit position 10010 222 Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a6e4fcd3f 63f91d0f15cebb1e391c9d83d42d4d6', # commit position 10022
223 223
224 'src/third_party/openmax_dl': 224 'src/third_party/openmax_dl':
225 Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), 225 Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
226 226
227 'src/third_party/jsoncpp/source': 227 'src/third_party/jsoncpp/source':
228 Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248 228 Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248
229 229
230 'src/third_party/libyuv': 230 'src/third_party/libyuv':
231 Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '62c49dc811f078e78ed76bfd 7c6358c8b7513a14', # from version 1487 231 Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '62c49dc811f078e78ed76bfd 7c6358c8b7513a14', # from version 1487
232 232
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 # migration completes (let's say Sep 1 2014). 806 # migration completes (let's say Sep 1 2014).
807 'name': 'check_git_config', 807 'name': 'check_git_config',
808 'pattern': '.', 808 'pattern': '.',
809 'action': [ 809 'action': [
810 'python', 810 'python',
811 'src/tools/check_git_config.py', 811 'src/tools/check_git_config.py',
812 '--running-as-hook', 812 '--running-as-hook',
813 ], 813 ],
814 }, 814 },
815 ] 815 ]
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698