Chromium Code Reviews

Side by Side Diff: DEPS

Issue 2330001: Update src/third_party/nss to r48440, which contains two changes:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 vars = { 1 vars = {
2 "webkit_trunk": 2 "webkit_trunk":
3 "http://svn.webkit.org/repository/webkit/trunk", 3 "http://svn.webkit.org/repository/webkit/trunk",
4 "webkit_revision": "60276", 4 "webkit_revision": "60276",
5 "ffmpeg_revision": "47712", 5 "ffmpeg_revision": "47712",
6 "skia_revision": "562", 6 "skia_revision": "562",
7 "chromium_git": "http://src.chromium.org/git", 7 "chromium_git": "http://src.chromium.org/git",
8 "swig_revision": "40423", 8 "swig_revision": "40423",
9 "nacl_revision": "2235", 9 "nacl_revision": "2235",
10 "libvpx_revision": "47701", 10 "libvpx_revision": "47701",
(...skipping 166 matching lines...)
177 "/trunk/deps/third_party/xulrunner-sdk@17887", 177 "/trunk/deps/third_party/xulrunner-sdk@17887",
178 "src/chrome_frame/tools/test/reference_build/chrome": 178 "src/chrome_frame/tools/test/reference_build/chrome":
179 "/trunk/deps/reference_builds/chrome_frame@33840", 179 "/trunk/deps/reference_builds/chrome_frame@33840",
180 180
181 # Parses Windows PE/COFF executable format. 181 # Parses Windows PE/COFF executable format.
182 "src/third_party/pefile": 182 "src/third_party/pefile":
183 "http://pefile.googlecode.com/svn/trunk@63", 183 "http://pefile.googlecode.com/svn/trunk@63",
184 184
185 # NSS, for SSLClientSocketNSS. 185 # NSS, for SSLClientSocketNSS.
186 "src/third_party/nss": 186 "src/third_party/nss":
187 "/trunk/deps/third_party/nss@45059", 187 "/trunk/deps/third_party/nss@48440",
188 188
189 "src/third_party/swig/win": 189 "src/third_party/swig/win":
190 "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), 190 "/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
191 191
192 "src/third_party/mingw-w64/mingw/bin": 192 "src/third_party/mingw-w64/mingw/bin":
193 ("http://nativeclient.googlecode.com/svn/trunk/src/third_party/mingw-w64/m ingw/bin@" + 193 ("http://nativeclient.googlecode.com/svn/trunk/src/third_party/mingw-w64/m ingw/bin@" +
194 Var("nacl_revision")), 194 Var("nacl_revision")),
195 }, 195 },
196 "mac": { 196 "mac": {
197 "src/chrome/tools/test/reference_build/chrome_mac": 197 "src/chrome/tools/test/reference_build/chrome_mac":
(...skipping 10 matching lines...)
208 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"), 208 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
209 "src/third_party/WebKit/WebKitLibraries": 209 "src/third_party/WebKit/WebKitLibraries":
210 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"), 210 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
211 211
212 # TODO(ajwong): Move this into the OS-independent block. 212 # TODO(ajwong): Move this into the OS-independent block.
213 "src/third_party/yasm/source/patched-yasm": 213 "src/third_party/yasm/source/patched-yasm":
214 "/trunk/deps/third_party/yasm/patched-yasm@29937", 214 "/trunk/deps/third_party/yasm/patched-yasm@29937",
215 215
216 "src/third_party/swig/mac": 216 "src/third_party/swig/mac":
217 "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"), 217 "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"),
218
219 # NSS, for SSLClientSocketNSS.
220 "src/third_party/nss":
221 "/trunk/deps/third_party/nss@48440",
218 }, 222 },
219 "unix": { 223 "unix": {
220 # Linux, really. 224 # Linux, really.
221 "src/chrome/tools/test/reference_build/chrome_linux": 225 "src/chrome/tools/test/reference_build/chrome_linux":
222 "/trunk/deps/reference_builds/chrome_linux@41515", 226 "/trunk/deps/reference_builds/chrome_linux@41515",
223 227
224 "src/third_party/xdg-utils": 228 "src/third_party/xdg-utils":
225 "/trunk/deps/third_party/xdg-utils@29103", 229 "/trunk/deps/third_party/xdg-utils@29103",
226 230
227 # TODO(ajwong): Move this into the OS-independent block. 231 # TODO(ajwong): Move this into the OS-independent block.
(...skipping 41 matching lines...)
269 "action": ["python", "src/build/gyp_chromium"], 273 "action": ["python", "src/build/gyp_chromium"],
270 }, 274 },
271 { 275 {
272 # Workaround XCode dependecies problem. 276 # Workaround XCode dependecies problem.
273 # TODO(bradnelson): remove this when fixed. 277 # TODO(bradnelson): remove this when fixed.
274 "pattern": ".", 278 "pattern": ".",
275 "action": ["python", 279 "action": ["python",
276 "src/build/mac/clobber_generated_headers.py"], 280 "src/build/mac/clobber_generated_headers.py"],
277 }, 281 },
278 ] 282 ]
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine