Checkout Linux sysroots using DEPS entrees instead of hooks Switch to the method preferred by Chromium. Change-Id: I073c1e897453ad8b25281017718e2c4622289b46 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/118958 Reviewed-by: Thomas Sepez <tsepez@google.com> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/DEPS b/DEPS index 8679ff6..0638ff6 100644 --- a/DEPS +++ b/DEPS
@@ -219,6 +219,7 @@ # TODO(337061377): Move into a separate allowed gcs bucket list. 'chromium-clang-format', + 'chrome-linux-sysroot', ] deps = { @@ -234,6 +235,90 @@ 'build': Var('chromium_git') + '/chromium/src/build.git@' + Var('build_revision'), + 'build/linux/debian_bullseye_amd64-sysroot': { + 'bucket': 'chrome-linux-sysroot', + 'condition': 'checkout_linux and checkout_x64 and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'generation': 1714590045814759, + 'object_name': 'dec7a3a0fc5b83b909cba1b6d119077e0429a138eadef6bf5a0f2e03b1904631', + 'sha256sum': 'dec7a3a0fc5b83b909cba1b6d119077e0429a138eadef6bf5a0f2e03b1904631', + 'size_bytes': 129948576, + }, + ], + }, + + 'build/linux/debian_bullseye_arm64-sysroot': { + 'bucket': 'chrome-linux-sysroot', + 'condition': 'checkout_linux and checkout_arm64 and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'generation': 1714589974958986, + 'object_name': '308e23faba3174bd01accfe358467b8a40fad4db4c49ef629da30219f65a275f', + 'sha256sum': '308e23faba3174bd01accfe358467b8a40fad4db4c49ef629da30219f65a275f', + 'size_bytes': 108470444, + }, + ], + }, + + 'build/linux/debian_bullseye_armhf-sysroot': { + 'bucket': 'chrome-linux-sysroot', + 'condition': 'checkout_linux and checkout_arm and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'generation': 1714589870087834, + 'object_name': 'fe81e7114b97440262bce004caf02c1514732e2fa7f99693b2836932ad1c4626', + 'sha256sum': 'fe81e7114b97440262bce004caf02c1514732e2fa7f99693b2836932ad1c4626', + 'size_bytes': 99265992, + }, + ], + }, + + 'build/linux/debian_bullseye_i386-sysroot': { + 'bucket': 'chrome-linux-sysroot', + 'condition': 'checkout_linux and (checkout_x86 or checkout_x64) and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'generation': 1714589989387491, + 'object_name': 'b53933120bb08ffc38140a817e3f0f99782254a6bf9622271574fa004e8783a4', + 'sha256sum': 'b53933120bb08ffc38140a817e3f0f99782254a6bf9622271574fa004e8783a4', + 'size_bytes': 122047968, + }, + ], + }, + + 'build/linux/debian_bullseye_mips64el-sysroot': { + 'bucket': 'chrome-linux-sysroot', + 'condition': 'checkout_linux and checkout_mips64 and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'generation': 1714590006168779, + 'object_name': '783cb79f26736c69e8125788d95ffb65a28172349009d75188838a004280a92b', + 'sha256sum': '783cb79f26736c69e8125788d95ffb65a28172349009d75188838a004280a92b', + 'size_bytes': 103362108, + }, + ], + }, + + 'build/linux/debian_bullseye_mipsel-sysroot': { + 'bucket': 'chrome-linux-sysroot', + 'condition': 'checkout_linux and checkout_mips and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'generation': 1714589936675352, + 'object_name': 'fcf8c3931476dd097c58f2f5d44621c7090b135e85ab56885aa4b44f4bd6cdb5', + 'sha256sum': 'fcf8c3931476dd097c58f2f5d44621c7090b135e85ab56885aa4b44f4bd6cdb5', + 'size_bytes': 96161964, + }, + ], + }, + 'buildtools': Var('chromium_git') + '/chromium/src/buildtools.git@' + Var('buildtools_revision'), @@ -673,41 +758,6 @@ 'condition': 'checkout_rust', }, { - 'name': 'sysroot_arm', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_arm', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=arm'], - }, - { - 'name': 'sysroot_arm64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_arm64', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=arm64'], - }, - { - 'name': 'sysroot_x86', - 'pattern': '.', - 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=x86'], - }, - { - 'name': 'sysroot_mips', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_mips', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=mips'], - }, - { - 'name': 'sysroot_x64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_x64', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=x64'], - }, - { 'name': 'test_fonts', 'pattern': '.', 'action': [ 'python3',