Roll abseil, android_ndk, build, buildtools, clang, libc++, and rust Roll third_party/abseil-cpp/ dd4432fb0..5e42a36a8 (8 commits) https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp.git/+log/dd4432fb0258..5e42a36a85a2 Migrate android_toolchain_version to android_ndk_version to align with Chromium's autoroller infrastructure. See https://crrev.com/c/7797609. Then, roll it to resolve compile errors. Roll android_ndk_version to 2@30.0.14608247 Roll build/ 08cae1166..8a46ede8e (104 commits) https://chromium.googlesource.com/chromium/src/build.git/+log/08cae1166f77..8a46ede8ea86 Roll buildtools/ 11cc2bd83..5e7f45b2c (21 commits) https://chromium.googlesource.com/chromium/src/buildtools.git/+log/11cc2bd83053..5e7f45b2c8d0 Roll tools/clang/ 772ec0f7d..3e520fe28 (16 commits) https://chromium.googlesource.com/chromium/src/tools/clang/+log/772ec0f7db79..3e520fe28bbe Roll clang+rust llvmorg-23-init-5669-g8a0be0bc-4 : llvmorg-23-init-10931-g20b6ec66-8 Roll third_party/libc++/src/ 7ab65651a..be1c391ac (324 commits) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/7ab65651aed6..be1c391acca0 Roll third_party/rust/ d403e286a..dbc491d22 (24 commits) https://chromium.googlesource.com/chromium/src/third_party/rust/+log/d403e286a47d..dbc491d22ee3 Roll tools/rust/ 69bb79a13..4442fd386 (5 commits) https://chromium.googlesource.com/chromium/src/tools/rust/+log/69bb79a132d3..4442fd3860a2 Change-Id: Icd4f9b4ffd073bd9bb66d816e94926aa48cf5267 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/147210 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Andy Phan <andyphan@chromium.org>
diff --git a/DEPS b/DEPS index fa52eb5..497ac8d 100644 --- a/DEPS +++ b/DEPS
@@ -2,6 +2,7 @@ gclient_gn_args_file = 'build/config/gclient_args.gni' gclient_gn_args = [ + 'android_ndk_version', 'build_with_chromium', 'checkout_android', 'checkout_skia', @@ -82,11 +83,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling abseil # and whatever else without interference from each other. - 'abseil_revision': 'dd4432fb02583b7a5b2b4fbf2012f7053e286ce0', + 'abseil_revision': '5e42a36a85a252d8cdee6c39661d2bfd9883fd5c', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_toolchain + # the commit queue can handle CLs rolling android_ndk # and whatever else without interference from each other. - 'android_toolchain_version': 'KXOia11cm9lVdUdPlbGLu8sCz6Y4ey_HV2s8_8qeqhgC', + 'android_ndk_version': Str('2@30.0.14608247'), # Three lines of non-changing comments so that # the commit queue can handle CLs rolling brotli # and whatever else without interference from each other. @@ -94,11 +95,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build # and whatever else without interference from each other. - 'build_revision': '08cae1166f77101a3ef811fc98942943dd68388a', + 'build_revision': '8a46ede8ea86151737d9c284f82d238b3c701fa7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling buildtools # and whatever else without interference from each other. - 'buildtools_revision': '11cc2bd83053cb790b7516aa3eb3f3935fb05a0e', + 'buildtools_revision': '5e7f45b2c8d0acf21ee52a32bb6ec83d4620eb59', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. @@ -110,7 +111,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling clang # and whatever else without interference from each other. - 'clang_revision': '772ec0f7db794d7c9bc4df748935ff13aaed36d7', + 'clang_revision': '3e520fe28bbeed4a87f5e575272933d359915989', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling code_coverage # and whatever else without interference from each other. @@ -180,7 +181,7 @@ # and whatever else without interference from each other. # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '7ab65651aed6802d2599dcb7a73b1f82d5179d05', + 'libcxx_revision': 'be1c391acca009d8d80535ce924e3d285451cdfa', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libc++abi # and whatever else without interference from each other. @@ -224,7 +225,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling rust # and whatever else without interference from each other. - 'rust_revision': 'd403e286a47dfb1ddbc334f84d58b75ef5ba7e5d', + 'rust_revision': 'dbc491d22ee3fe201b3c3c4b1e52beac75732f33', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling simdutf # and whatever else without interference from each other. @@ -252,7 +253,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling tools_rust # and whatever else without interference from each other. - 'tools_rust_revision': '69bb79a132d32d67b6f6820226b02e50f1945202', + 'tools_rust_revision': '4442fd3860a2e9ddd753850c917b65ade6d8ad0e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling tools_win_revision # and whatever else without interference from each other. @@ -354,7 +355,7 @@ 'packages': [ { 'package': 'chromium/third_party/android_toolchain/android_toolchain', - 'version': Var('android_toolchain_version'), + 'version': 'version:' + Var('android_ndk_version'), }, ], 'condition': 'checkout_android_native_support', @@ -461,157 +462,157 @@ 'objects': [ { # The Android libclang_rt.builtins libraries are currently only included in the Linux clang package. - 'object_name': 'Linux_x64/clang-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'bd3a3d7e98cc9037daf24bd7b48f52ba0f0ea5e435c1c707e381034ee4b3c1d6', - 'size_bytes': 68803796, - 'generation': 1775108855393489, + 'object_name': 'Linux_x64/clang-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '6aa45b7398e915919ce07a5e1e15e8710327957f61c1d97d18e77e5f167e9d14', + 'size_bytes': 69605340, + 'generation': 1777639339258203, 'condition': '(host_os == "linux" or checkout_android) and non_git_source', }, { - 'object_name': 'Linux_x64/clang-tidy-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '580dcbef886d28480d0e1dc2b6d4287577fa01d08aadb13993045c4830d38fad', - 'size_bytes': 14398028, - 'generation': 1775108855773342, + 'object_name': 'Linux_x64/clang-tidy-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '0f6db77d3bd03bd39add2f13a19072236ae00feddc45dc51dfe976d58dd843de', + 'size_bytes': 14615020, + 'generation': 1777639339339127, 'condition': 'host_os == "linux" and checkout_clang_tidy and non_git_source', }, { - 'object_name': 'Linux_x64/clangd-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'd77743e2b6bd827c080ec67dffce26753c1b0c039ec5736d066ba5aa097736e2', - 'size_bytes': 14639544, - 'generation': 1775108856105229, + 'object_name': 'Linux_x64/clangd-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'dbbb792a7893c3477fe2a9e378b6a09ed93dbff41f707941b7c84939ba74649c', + 'size_bytes': 14786588, + 'generation': 1777639339349447, 'condition': 'host_os == "linux" and checkout_clangd and non_git_source', }, { - 'object_name': 'Linux_x64/llvm-code-coverage-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '2a1262a4f7893351bd6249b2f10ea2fd62064ad527d0572b41d9c469a2d6e191', - 'size_bytes': 2330560, - 'generation': 1775108856568087, + 'object_name': 'Linux_x64/llvm-code-coverage-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '1e1f962a845d5246e6b541e25ef6bae50b381ec64243f3cc2aee0b8c7d718a8e', + 'size_bytes': 2336008, + 'generation': 1777639339569555, 'condition': 'host_os == "linux" and checkout_clang_coverage_tools and non_git_source', }, { - 'object_name': 'Linux_x64/llvmobjdump-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'ee43d3cc82df2affd7f290b0b99a65f22bdb1e6d4369323c35a008df550d4bcc', - 'size_bytes': 5798744, - 'generation': 1775108855922066, + 'object_name': 'Linux_x64/llvmobjdump-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'f3701a93e5ad4eae4d3aa0c853dd71a4e776d8f9cec5db3e0c800e1843d5a9a4', + 'size_bytes': 5793432, + 'generation': 1777639339446398, 'condition': '((checkout_linux or checkout_mac or checkout_android) and host_os == "linux") and non_git_source', }, { - 'object_name': 'Mac/clang-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'f600d79485ae1354b22e068149f624a8f53a15f59d48c249d544c2e11ed0eafb', - 'size_bytes': 54827088, - 'generation': 1775108859195599, + 'object_name': 'Mac/clang-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'd25493bb0c74e7aad55135b0aceed9dcca22d6477043cb005aa3ccce7d708b83', + 'size_bytes': 55341104, + 'generation': 1777639341141424, 'condition': 'host_os == "mac" and host_cpu == "x64"', }, { - 'object_name': 'Mac/clang-mac-runtime-library-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '3a173578e5cc6757397d5e0c31cbf15bc35edc7a807e773c4cce82be217b0361', - 'size_bytes': 1012412, - 'generation': 1775108882604681, + 'object_name': 'Mac/clang-mac-runtime-library-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '2f1677e29b78c584450ce6f5d72273f9584ac43d51bc9ca91619b045e93c2c12', + 'size_bytes': 1016564, + 'generation': 1777639349729752, 'condition': 'checkout_mac and not host_os == "mac"', }, { - 'object_name': 'Mac/clang-tidy-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '12925a9b71f1a1709ff2a049105a353785a9cbb7bafb70fe226642f1b0ee227c', - 'size_bytes': 14286844, - 'generation': 1775108859499025, + 'object_name': 'Mac/clang-tidy-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'f8a6449263f115c9f69371cf415899d186f11790dce0b6022a7b3a583b0716f5', + 'size_bytes': 14567332, + 'generation': 1777639341376334, 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_tidy', }, { - 'object_name': 'Mac/clangd-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '50443c1df5e730305712f7ec625a77f8de4db6bf0337700093b540d279d3b95e', - 'size_bytes': 15456916, - 'generation': 1775108860055239, + 'object_name': 'Mac/clangd-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'dbd23694bd418555f8a65871f4b862830db1045f785e003822c4124f6da99484', + 'size_bytes': 15995436, + 'generation': 1777639341422572, 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clangd', }, { - 'object_name': 'Mac/llvm-code-coverage-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'bbd27aabf53ceb2d5bcc456dad817ef9854706774073a7ff2d6d15a3651186a0', - 'size_bytes': 2376820, - 'generation': 1775108861016266, + 'object_name': 'Mac/llvm-code-coverage-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'c24cbc8695bb7ed7f5c9709b6ff2925d57c635b27375c374f23860dec9d633ac', + 'size_bytes': 2379552, + 'generation': 1777639341530758, 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_coverage_tools', }, { - 'object_name': 'Mac/llvmobjdump-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'a000b3e10a7fd9fe3d8e0ea660448362265988e0aebf3e169edccce580b5fcdb', - 'size_bytes': 5718704, - 'generation': 1775108860105704, + 'object_name': 'Mac/llvmobjdump-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '98ac084036e387b7da7729fdb4f0dde9724897b52642f2b1f20782968765c24f', + 'size_bytes': 5722328, + 'generation': 1777639341526564, 'condition': 'host_os == "mac" and host_cpu == "x64"', }, { - 'object_name': 'Mac_arm64/clang-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '84c08af500d1695d2bc378e58bde7e697847597e8e35d0d35f00c603c0c7021b', - 'size_bytes': 45847348, - 'generation': 1775108885241255, + 'object_name': 'Mac_arm64/clang-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'f6fd465945dae58eff22819cdc62ccae2271dd3cf624a2fa68d87f634f32dcb7', + 'size_bytes': 46106304, + 'generation': 1777639351295488, 'condition': 'host_os == "mac" and host_cpu == "arm64"', }, { - 'object_name': 'Mac_arm64/clang-tidy-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '9308c7d911f24f1da820b5e6d114cb72be85c8a8077a3b1e8a2b84c893cdebbb', - 'size_bytes': 12441916, - 'generation': 1775108885395968, + 'object_name': 'Mac_arm64/clang-tidy-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '26d400934fee65cd9af87d0d7c23c3ec086adac93459759d44ced9b7519694a2', + 'size_bytes': 12619892, + 'generation': 1777639351445994, 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_tidy', }, { - 'object_name': 'Mac_arm64/clangd-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'b36413059134c1e3cfdad8e2a5bc2d71129ccc472e3c7f36e10c2bf42bfb4144', - 'size_bytes': 12818368, - 'generation': 1775108885742159, + 'object_name': 'Mac_arm64/clangd-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'cd4aed6e6e89a9616c76de4faee90f335dea9fc69b45b0d00fb9b9eddb9f81b4', + 'size_bytes': 12980784, + 'generation': 1777639351661710, 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clangd', }, { - 'object_name': 'Mac_arm64/llvm-code-coverage-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '143919e811987b59034b7fb4a1318d756a06bbcc0def2213f6fa0fab16cf98d1', - 'size_bytes': 1989380, - 'generation': 1775108886721636, + 'object_name': 'Mac_arm64/llvm-code-coverage-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'b2ff8a6e42fa14d4bb58a03a64962be7230a47dc2f8eeb83ad1d46cddc4d70da', + 'size_bytes': 1992948, + 'generation': 1777639351899002, 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_coverage_tools', }, { - 'object_name': 'Mac_arm64/llvmobjdump-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '8e48488827c82749bc75e7bcd4209d9d780dfe45fa8cd29f96b3a8dbcd9213b9', - 'size_bytes': 5423800, - 'generation': 1775108886019106, + 'object_name': 'Mac_arm64/llvmobjdump-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'd1e42c8009c5983bbb37867bba8522db876bd32bb76c6e5560bf5134a02f7aaf', + 'size_bytes': 5444568, + 'generation': 1777639351710887, 'condition': 'host_os == "mac" and host_cpu == "arm64"', }, { - 'object_name': 'Win/clang-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '3de6f77fcf0b2194a1353dfe5048fcbae67f14e9a6ee090c4c432ee60bbd9e80', - 'size_bytes': 49580864, - 'generation': 1775108905186981, + 'object_name': 'Win/clang-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '7fa1aa9bf477f565687a2f516bf75ff6bfdd13da9b36bf521a75ac8ae2761d6a', + 'size_bytes': 50211688, + 'generation': 1777639362668478, 'condition': 'host_os == "win"', }, { - 'object_name': 'Win/clang-tidy-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '907c8dc44e9a3bd7e8441c8580573a25f4ca412ccfc4eb4aa5c64d4ed53e5066', - 'size_bytes': 14476012, - 'generation': 1775108905754695, + 'object_name': 'Win/clang-tidy-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '36f00ca3c9ae9bbf226dbe5625b42e06ddf9cfe81586e89c6cd96fa1ed99cc7b', + 'size_bytes': 14723216, + 'generation': 1777639362810257, 'condition': 'host_os == "win" and checkout_clang_tidy', }, { - 'object_name': 'Win/clang-win-runtime-library-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '42cc02df5890c075d40a5694d485700bc5d47d8a6df0d601662fef712d8b9f72', - 'size_bytes': 2592964, - 'generation': 1775108927726013, + 'object_name': 'Win/clang-win-runtime-library-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'f25fb199c927f86083f5b6d2641daac60aa81de9ea1204f38e9301c2889a0dec', + 'size_bytes': 2611460, + 'generation': 1777639371151452, 'condition': 'checkout_win and not host_os == "win"', }, { - 'object_name': 'Win/clangd-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': 'fc7c297e4c28c7ebe28b520806edf35bd204072bda4660d2cfbe5fd89691ec91', - 'size_bytes': 14863828, - 'generation': 1775108906103106, - 'condition': 'host_os == "win" and checkout_clangd', + 'object_name': 'Win/clangd-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '0ef91424212a6b4cb6da4fe6a97ffca044b9469a246ae5a2d3d58dd8e02f2e98', + 'size_bytes': 15101300, + 'generation': 1777639362859425, + 'condition': 'host_os == "win" and checkout_clangd', }, { - 'object_name': 'Win/llvm-code-coverage-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '290a80496d49a5696960a8d0b2bb7737be3de2cf441b3ee24a7c3f0e6657d61d', - 'size_bytes': 2476152, - 'generation': 1775108907002072, + 'object_name': 'Win/llvm-code-coverage-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': 'ab1fe0acdb40306cadde73474437a98483a914f1bfad95d8de4d5d0c3dae2d18', + 'size_bytes': 2500728, + 'generation': 1777639362926842, 'condition': 'host_os == "win" and checkout_clang_coverage_tools', }, { - 'object_name': 'Win/llvmobjdump-llvmorg-23-init-5669-g8a0be0bc-4.tar.xz', - 'sha256sum': '89a6e9303824ebbc88cd3f8ff5ee38266ba1e247877d9c61cbcbe196098acf38', - 'size_bytes': 5833644, - 'generation': 1775108906300539, + 'object_name': 'Win/llvmobjdump-llvmorg-23-init-10931-g20b6ec66-8.tar.xz', + 'sha256sum': '9f3bf71579786784762963c50cdc908ad07213a8b8c7f81edca209c095b130a9', + 'size_bytes': 5868192, + 'generation': 1777639362899299, 'condition': '(checkout_linux or checkout_mac or checkout_android) and host_os == "win"', }, ] @@ -651,31 +652,31 @@ 'bucket': 'chromium-browser-clang', 'objects': [ { - 'object_name': 'Linux_x64/rust-toolchain-6f54d591c3116ee7f8ce9321ddeca286810cc142-7-llvmorg-23-init-5669-g8a0be0bc.tar.xz', - 'sha256sum': 'afbb00d27b8f9f65e6a754fb21e80dff084993285cf7f3c0020dece59c5bd67a', - 'size_bytes': 271641712, - 'generation': 1773769777991797, + 'object_name': 'Linux_x64/rust-toolchain-4c4205163abcbd08948b3efab796c543ba1ea687-2-llvmorg-23-init-10931-g20b6ec66.tar.xz', + 'sha256sum': 'a96863c5b811af23cbe3f20fcfc82939e637be2bd79f05a117f1762c3bb35fe5', + 'size_bytes': 274625900, + 'generation': 1776704596417466, 'condition': 'host_os == "linux" and non_git_source', }, { - 'object_name': 'Mac/rust-toolchain-6f54d591c3116ee7f8ce9321ddeca286810cc142-7-llvmorg-23-init-5669-g8a0be0bc.tar.xz', - 'sha256sum': '70b86e82f1cb55777d40b5828ddcb80afea49510085290424b61251d22e9f959', - 'size_bytes': 259443552, - 'generation': 1773769780408342, + 'object_name': 'Mac/rust-toolchain-4c4205163abcbd08948b3efab796c543ba1ea687-2-llvmorg-23-init-10931-g20b6ec66.tar.xz', + 'sha256sum': 'cfb1cfa17fe96540ae732b2ed8cef39792786f7d84c317f3aca2004f2495c3fa', + 'size_bytes': 262623268, + 'generation': 1776704598519695, 'condition': 'host_os == "mac" and host_cpu == "x64"', }, { - 'object_name': 'Mac_arm64/rust-toolchain-6f54d591c3116ee7f8ce9321ddeca286810cc142-7-llvmorg-23-init-5669-g8a0be0bc.tar.xz', - 'sha256sum': 'e2e19684f31b653ce9238f6303aec22576085528c294757a7157d4ab5e1926dc', - 'size_bytes': 242768940, - 'generation': 1773769782590875, + 'object_name': 'Mac_arm64/rust-toolchain-4c4205163abcbd08948b3efab796c543ba1ea687-2-llvmorg-23-init-10931-g20b6ec66.tar.xz', + 'sha256sum': 'f7b34f50331e3d22b9b79b8217b3645dd67700ee801bec801da09bcffb583f9c', + 'size_bytes': 245410044, + 'generation': 1776704600641512, 'condition': 'host_os == "mac" and host_cpu == "arm64"', }, { - 'object_name': 'Win/rust-toolchain-6f54d591c3116ee7f8ce9321ddeca286810cc142-7-llvmorg-23-init-5669-g8a0be0bc.tar.xz', - 'sha256sum': '37dd250549fed5a9765c3a88e3487409189e0c9c63b691fc77daa0b5f214bced', - 'size_bytes': 409536908, - 'generation': 1773769784773096, + 'object_name': 'Win/rust-toolchain-4c4205163abcbd08948b3efab796c543ba1ea687-2-llvmorg-23-init-10931-g20b6ec66.tar.xz', + 'sha256sum': 'bd99ed04453ccef4916211c6db0a7afd1185b69371e1921ebd94f9bec78af73e', + 'size_bytes': 413531112, + 'generation': 1776704602737316, 'condition': 'host_os == "win"', }, ],
diff --git a/tools/roll_pdfium_deps.py b/tools/roll_pdfium_deps.py index 7e599ad..8d72be6 100755 --- a/tools/roll_pdfium_deps.py +++ b/tools/roll_pdfium_deps.py
@@ -10,7 +10,7 @@ ALL_DEPS_ENTRIES = ( 'abseil_revision', - 'android_toolchain_version', + 'android_ndk_version', 'brotli_revision', 'build_revision', 'buildtools_revision',
diff --git a/tools/roll_pdfium_deps_test.py b/tools/roll_pdfium_deps_test.py index 1e59687..c7a4670 100644 --- a/tools/roll_pdfium_deps_test.py +++ b/tools/roll_pdfium_deps_test.py
@@ -38,6 +38,10 @@ vars = { + # The version of the NDK. Set here, to allow the autoroller to update this + # value when updating the CIPD hash. + 'android_ndk_version': Str('2@30.0.14608247'), + # Variable that can be used to support multiple build scenarios, like having # Chromium specific targets in a client project's GN file or sync dependencies # conditionally etc. @@ -974,7 +978,7 @@ 'packages': [ { 'package': 'chromium/third_party/android_toolchain/android_toolchain', - 'version': 'KXOia11cm9lVdUdPlbGLu8sCz6Y4ey_HV2s8_8qeqhgC', + 'version': 'version:' + Var('android_ndk_version'), }, ], 'condition': 'checkout_android and non_git_source', @@ -1496,6 +1500,7 @@ gclient_gn_args_file = 'build/config/gclient_args.gni' gclient_gn_args = [ + 'android_ndk_version', 'build_with_chromium', 'checkout_android', 'checkout_skia', @@ -1567,9 +1572,9 @@ # and whatever else without interference from each other. 'abseil_revision': '14a5b78f39684f85a19690e63c722d6bb680f2cd', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_toolchain + # the commit queue can handle CLs rolling android_ndk # and whatever else without interference from each other. - 'android_toolchain_version': 'KXOia11cm9lVdUdPlbGLu8sCz6Y4ey_HV2s8_8qeqhgC', + 'android_ndk_version': Str('2@30.0.14608247'), # Three lines of non-changing comments so that # the commit queue can handle CLs rolling brotli # and whatever else without interference from each other. @@ -1837,7 +1842,7 @@ 'packages': [ { 'package': 'chromium/third_party/android_toolchain/android_toolchain', - 'version': Var('android_toolchain_version'), + 'version': 'version:' + Var('android_ndk_version'), }, ], 'condition': 'checkout_android_native_support', @@ -2401,7 +2406,7 @@ def testCipdDepsRollsNothingToRoll(self): success, message = roll_dep(CHROMIUM_DEPS, PDFIUM_DEPS, - 'android_toolchain_version') + 'android_ndk_version') self.assertTrue(success) self.assertEqual('Revisions are the same.', message)