| OLD | NEW |
| 1 # DEPS files look like -*- Python -*- | 1 # DEPS files look like -*- Python -*- |
| 2 | 2 |
| 3 vars = { | 3 vars = { |
| 4 # These revisions are slices of the chromium repository. | 4 # These revisions are slices of the chromium repository. |
| 5 # Because they come from separate sub-slices, their hashes do not match at | 5 # Because they come from separate sub-slices, their hashes do not match at |
| 6 # equivalent revisions. When updating them, use the roll-dep script | 6 # equivalent revisions. When updating them, use the roll-dep script |
| 7 # to move them to equivalent revisions. Additionally, because not all | 7 # to move them to equivalent revisions. Additionally, because not all |
| 8 # directories contain commits at each revision, you will need to select | 8 # directories contain commits at each revision, you will need to select |
| 9 # revisions at latest revision up to a high watermark from each slice. | 9 # revisions at latest revision up to a high watermark from each slice. |
| 10 # Document the high watermark here: | 10 # Document the high watermark here: |
| 11 # chrome_rev: 411082 | 11 # chrome_rev: 424840 |
| 12 "build_rev": "43fc964cebbd602e2bd9721253d510a4f42d93ac", # from cr commit posi
tion 415304 | 12 "build_rev": "35915a4e77b124044c105896485d40f6fdd969e2", # from cr commit posi
tion 424824 |
| 13 "binutils_rev": "8d77853bc9415bcb7bb4206fa2901de7603387db", # from cr commit p
osition 392828 | 13 "binutils_rev": "8d77853bc9415bcb7bb4206fa2901de7603387db", # from cr commit p
osition 392828 |
| 14 "libcxx_static_rev": "fd8f9a82862aa40dab0c5bcdea6e498715284f5a", # from cr com
mit position 369150 | |
| 15 # NOTE: be sure to update clang_lib_version in SConstruct whenever | 14 # NOTE: be sure to update clang_lib_version in SConstruct whenever |
| 16 # updating this clang_rev (e.g., if LLVM changes from version 3.7 to 3.8). | 15 # updating this clang_rev (e.g., if LLVM changes from version 3.7 to 3.8). |
| 17 "clang_rev": "f26ef1bab777afd1379aa900e7f39b99100db725", # from cr commit posi
tion 415563 | 16 "clang_rev": "3d97083b856ee7262f59c1a93beaa65174c8ca0a", # from cr commit posi
tion 424416 |
| 17 |
| 18 # Rolls of build_overrides_rev should done at the same time as a roll |
| 19 # of build_rev as build_overrides/ is tightly coupled with build/. |
| 20 # build_overrides/ is forked from chromium/src/build_overrides/ and |
| 21 # needs to be manually updated to keep in sync before a build_rev |
| 22 # update can be done. |
| 23 "build_overrides_rev": "2202dc63a4fe83cde3c5b90fe80b3d8c72accc36", |
| 18 | 24 |
| 19 # NOTE! These five should be kept up to date with their counterparts in | 25 # NOTE! These five should be kept up to date with their counterparts in |
| 20 # chromium/src/DEPS. | 26 # chromium/src/DEPS. |
| 21 # Be sure to update them when updating the chromium slice revisions above. | 27 # Be sure to update them when updating the chromium slice revisions above. |
| 22 # (This is not essential for Breakpad, because we do not use its code | 28 # (This is not essential for Breakpad, because we do not use its code |
| 23 # in the build that goes into Chromium. But we might as well update it too.) | 29 # in the build that goes into Chromium. But we might as well update it too.) |
| 24 # You should now use the roll-dep script in depot_tools to do this update. | 30 # You should now use the roll-dep script in depot_tools to do this update. |
| 25 "gtest_rev": "6f8a66431cb592dad629028a50b3dd418a408c87", | 31 "gtest_rev": "6f8a66431cb592dad629028a50b3dd418a408c87", |
| 26 "gyp_rev": "c61b0b35c8396bfd59efc6cfc11401d912b0f510", | 32 "gyp_rev": "e7079f0e0e14108ab0dba58728ff219637458563", |
| 27 "breakpad_rev": "5f638d532312685548d5033618c8a36f73302d0a", | |
| 28 # Three lines of non-changing comments so that | 33 # Three lines of non-changing comments so that |
| 29 # the commit queue can handle CLs rolling build tools | 34 # the commit queue can handle CLs rolling build tools |
| 30 # and whatever else without interference from each other. | 35 # and whatever else without interference from each other. |
| 31 'buildtools_revision': 'adb8bf4e8fc92aa1717bf151b862d58e6f27c4f2', | 36 'buildtools_revision': '39b1db2ab4aa4b2ccaa263c29bdf63e7c1ee28aa', |
| 32 # Three lines of non-changing comments so that | 37 # Three lines of non-changing comments so that |
| 33 # the commit queue can handle CLs rolling lss | 38 # the commit queue can handle CLs rolling lss |
| 34 # and whatever else without interference from each other. | 39 # and whatever else without interference from each other. |
| 35 'lss_revision': '3f6478ac95edf86cd3da300c2c0d34a438f5dbeb', | 40 'lss_revision': '3f6478ac95edf86cd3da300c2c0d34a438f5dbeb', |
| 36 | 41 |
| 42 "breakpad_rev": "5f638d532312685548d5033618c8a36f73302d0a", |
| 43 |
| 37 # Separately pinned repositories, update with roll-dep individually. | 44 # Separately pinned repositories, update with roll-dep individually. |
| 38 "third_party_rev": "d4e38e5faf600b39649025e5605d6e7f94518ea7", | 45 "third_party_rev": "d4e38e5faf600b39649025e5605d6e7f94518ea7", |
| 39 "lcov_rev": "b37daf5968200da8ff520ce65c4e5bce4047dd15", # from svn revision 14
9720 | 46 "lcov_rev": "b37daf5968200da8ff520ce65c4e5bce4047dd15", # from svn revision 14
9720 |
| 40 "gnu_binutils_rev": "f4003433b61b25666565690caf3d7a7a1a4ec436", # from svn rev
ision 8151 | 47 "gnu_binutils_rev": "f4003433b61b25666565690caf3d7a7a1a4ec436", # from svn rev
ision 8151 |
| 41 "mingw_rev": "3cc8b140b883a9fe4986d12cfd46c16a093d3527", # from svn revision 7
064 | 48 "mingw_rev": "3cc8b140b883a9fe4986d12cfd46c16a093d3527", # from svn revision 7
064 |
| 42 "nsis_rev": "21b6ad22daa7bfc04b9f1c1805a34622e2607a93", # from svn revision 70
71 | 49 "nsis_rev": "21b6ad22daa7bfc04b9f1c1805a34622e2607a93", # from svn revision 70
71 |
| 43 "ragel_rev": "da42bb33f1b67c2d70b38ec1d2edf5263271b635", # from svn revision 9
010 | 50 "ragel_rev": "da42bb33f1b67c2d70b38ec1d2edf5263271b635", # from svn revision 9
010 |
| 44 "validator_snapshots_rev": "ef053694ef9b0d98d9bed0b9bb649963084bfc81", | 51 "validator_snapshots_rev": "ef053694ef9b0d98d9bed0b9bb649963084bfc81", |
| 45 # Rolls of build_overrides_rev should done at the same time as a roll of | |
| 46 # build_rev as build_overrides/ is tightly coupled with build/. | |
| 47 "build_overrides_rev": "2881125066dcf38dae595d92eac8a6b477529116", | |
| 48 | 52 |
| 49 "chromium_git": "https://chromium.googlesource.com", | 53 "chromium_git": "https://chromium.googlesource.com", |
| 50 } | 54 } |
| 51 | 55 |
| 52 deps = { | 56 deps = { |
| 53 "breakpad": | 57 "breakpad": |
| 54 Var("chromium_git") + "/breakpad/breakpad.git@" + | 58 Var("chromium_git") + "/breakpad/breakpad.git@" + |
| 55 Var("breakpad_rev"), | 59 Var("breakpad_rev"), |
| 56 "buildtools": | 60 "buildtools": |
| 57 Var("chromium_git") + "/chromium/buildtools.git@" + | 61 Var("chromium_git") + "/chromium/buildtools.git@" + |
| (...skipping 12 matching lines...) Expand all Loading... |
| 70 Var("third_party_rev"), | 74 Var("third_party_rev"), |
| 71 "validator_snapshots": | 75 "validator_snapshots": |
| 72 (Var("chromium_git") + "/native_client/src/validator_snapshots.git@" + | 76 (Var("chromium_git") + "/native_client/src/validator_snapshots.git@" + |
| 73 Var("validator_snapshots_rev")), | 77 Var("validator_snapshots_rev")), |
| 74 "third_party/binutils": | 78 "third_party/binutils": |
| 75 Var("chromium_git") + "/chromium/src/third_party/binutils.git@" + | 79 Var("chromium_git") + "/chromium/src/third_party/binutils.git@" + |
| 76 Var("binutils_rev"), | 80 Var("binutils_rev"), |
| 77 "third_party/lcov": | 81 "third_party/lcov": |
| 78 Var("chromium_git") + "/chromium/src/third_party/lcov.git@" + | 82 Var("chromium_git") + "/chromium/src/third_party/lcov.git@" + |
| 79 Var("lcov_rev"), | 83 Var("lcov_rev"), |
| 80 "third_party/libc++-static": | |
| 81 Var("chromium_git") + "/chromium/src/third_party/libc++-static.git@" + | |
| 82 Var("libcxx_static_rev"), | |
| 83 "third_party/lss": | 84 "third_party/lss": |
| 84 Var("chromium_git") + "/linux-syscall-support.git@" + | 85 Var("chromium_git") + "/linux-syscall-support.git@" + |
| 85 Var("lss_revision"), | 86 Var("lss_revision"), |
| 86 "tools/clang": | 87 "tools/clang": |
| 87 Var("chromium_git") + "/chromium/src/tools/clang.git@" + Var("clang_rev"), | 88 Var("chromium_git") + "/chromium/src/tools/clang.git@" + Var("clang_rev"), |
| 88 "tools/gyp": | 89 "tools/gyp": |
| 89 Var("chromium_git") + "/external/gyp.git@" + Var("gyp_rev"), | 90 Var("chromium_git") + "/external/gyp.git@" + Var("gyp_rev"), |
| 90 } | 91 } |
| 91 | 92 |
| 92 deps_os = { | 93 deps_os = { |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 'name': 'clang_format_linux', | 220 'name': 'clang_format_linux', |
| 220 'pattern': '.', | 221 'pattern': '.', |
| 221 'action': [ 'download_from_google_storage', | 222 'action': [ 'download_from_google_storage', |
| 222 '--no_resume', | 223 '--no_resume', |
| 223 '--platform=linux*', | 224 '--platform=linux*', |
| 224 '--no_auth', | 225 '--no_auth', |
| 225 '--bucket', 'chromium-clang-format', | 226 '--bucket', 'chromium-clang-format', |
| 226 '-s', 'buildtools/linux64/clang-format.sha1', | 227 '-s', 'buildtools/linux64/clang-format.sha1', |
| 227 ], | 228 ], |
| 228 }, | 229 }, |
| 229 # Pull the prebuilt libc++ static library for mac. | |
| 230 { | |
| 231 'name': 'libcpp_mac', | |
| 232 'pattern': '.', | |
| 233 'action': [ 'download_from_google_storage', | |
| 234 '--no_resume', | |
| 235 '--platform=darwin', | |
| 236 '--no_auth', | |
| 237 '--bucket', 'chromium-libcpp', | |
| 238 '-s', 'third_party/libc++-static/libc++.a.sha1', | |
| 239 ], | |
| 240 }, | |
| 241 | 230 |
| 242 ### | 231 ### |
| 243 ### End of clauses copied (almost verbatim) from chromium/src/DEPS. | 232 ### End of clauses copied (almost verbatim) from chromium/src/DEPS. |
| 244 ### | 233 ### |
| 245 | 234 |
| 246 # Pull NaCl Toolchain binaries. | 235 # Pull NaCl Toolchain binaries. |
| 247 { | 236 { |
| 248 "pattern": ".", | 237 "pattern": ".", |
| 249 "action": ["python", | 238 "action": ["python", |
| 250 "native_client/build/package_version/package_version.py", | 239 "native_client/build/package_version/package_version.py", |
| 251 "sync", "--extract", | 240 "sync", "--extract", |
| 252 ], | 241 ], |
| 253 }, | 242 }, |
| 254 # Cleanup any stale package_version files. | 243 # Cleanup any stale package_version files. |
| 255 { | 244 { |
| 256 "pattern": ".", | 245 "pattern": ".", |
| 257 "action": ["python", | 246 "action": ["python", |
| 258 "native_client/build/package_version/package_version.py", | 247 "native_client/build/package_version/package_version.py", |
| 259 "cleanup", | 248 "cleanup", |
| 260 ], | 249 ], |
| 261 }, | 250 }, |
| 262 ] | 251 ] |
| 263 | 252 |
| 264 include_rules = [ | 253 include_rules = [ |
| 265 "+native_client/src/include", | 254 "+native_client/src/include", |
| 266 "+gtest", | 255 "+gtest", |
| 267 ] | 256 ] |
| OLD | NEW |