From cb507ae1b9feaeeb4ead79116cceee037e77b29c Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 20 Mar 2025 15:05:15 +0000 Subject: [PATCH 01/68] added initial cloudbuild configs for testing builds --- cloudbuild.yaml | 125 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 cloudbuild.yaml diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 00000000000000..8d28f164bc5e6a --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,125 @@ +# Set build timeout to 120 mins rather than the default of 10 mins +timeout: 7200s + +options: + machineType: 'E2_HIGHCPU_32' + +steps: + # 1. Install Dependencies + - name: 'gcr.io/cloud-builders/apt' + id: 'install-deps' + args: ['install', '-y', 'git', 'python3', 'curl', 'ninja-build', 'pkg-config', 'libnss3-dev', 'libssl-dev'] + + # 2. Install Depot Tools + - name: 'gcr.io/cloud-builders/git' + id: 'clone-depot-tools' + args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] + + - name: 'ubuntu' + id: 'setup-depot-tools' + waitFor: ['clone-depot-tools'] + entrypoint: 'bash' + args: + - '-c' + - | + echo 'export PATH=$PATH:/workspace/depot_tools' >> ~/.bashrc + source ~/.bashrc + + # 3. Fetch the Code + - name: 'ubuntu' + id: 'configure-gclient' + waitFor: [ 'fetch-code' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium + gclient config --unmanaged --name src \ + --custom-var build_with_hopium=True \ + --custom-var checkout_pgo_profiles=True \ + git@github.com:protectednet/hopium.git + + - name: 'ubuntu' + id: 'sync-deps' + waitFor: [ 'configure-gclient' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium + gclient sync -r $TAG_NAME + + - name: 'ubuntu' + id: 'checkout-branch' + waitFor: [ 'sync-deps' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium/src + git checkout $TAG_NAME + gclient sync -D + + # 4. Configure & Build + - name: 'ubuntu' + id: 'configure-build' + waitFor: [ 'checkout-branch' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium/src + gn args out/Debug < Date: Thu, 20 Mar 2025 15:37:33 +0000 Subject: [PATCH 02/68] fix logging options for cloudbuild --- cloudbuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 8d28f164bc5e6a..1609a700471bed 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -3,6 +3,7 @@ timeout: 7200s options: machineType: 'E2_HIGHCPU_32' + logging: 'CLOUD_LOGGING_ONLY' steps: # 1. Install Dependencies From d06fe01d08311457a0459e778c3b1e7678f21ccc Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 20 Mar 2025 15:43:09 +0000 Subject: [PATCH 03/68] fix path export --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 1609a700471bed..abd00cbc03620c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,7 +23,7 @@ steps: args: - '-c' - | - echo 'export PATH=$PATH:/workspace/depot_tools' >> ~/.bashrc + echo "export PATH=/workspace/depot_tools:$PATH" >> ~/.bashrc source ~/.bashrc # 3. Fetch the Code From dd3ace81a178c38cd8797f65a11842ad664c3f58 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 20 Mar 2025 15:49:37 +0000 Subject: [PATCH 04/68] fix path export --- cloudbuild.yaml | 216 ++++++++++++++++++++++++------------------------ 1 file changed, 106 insertions(+), 110 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index abd00cbc03620c..a9f7c2e8980904 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,125 +2,121 @@ timeout: 7200s options: - machineType: 'E2_HIGHCPU_32' - logging: 'CLOUD_LOGGING_ONLY' + machineType: 'E2_HIGHCPU_32' + logging: 'CLOUD_LOGGING_ONLY' steps: - # 1. Install Dependencies - - name: 'gcr.io/cloud-builders/apt' - id: 'install-deps' - args: ['install', '-y', 'git', 'python3', 'curl', 'ninja-build', 'pkg-config', 'libnss3-dev', 'libssl-dev'] +# 1. Install Dependencies +- name: 'gcr.io/cloud-builders/apt' + id: 'install-deps' + args: ['install', '-y', 'git', 'python3', 'curl', 'ninja-build', 'pkg-config', 'libnss3-dev', 'libssl-dev'] - # 2. Install Depot Tools - - name: 'gcr.io/cloud-builders/git' - id: 'clone-depot-tools' - args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] +# 2. Install Depot Tools +- name: 'gcr.io/cloud-builders/git' + id: 'clone-depot-tools' + args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] - - name: 'ubuntu' - id: 'setup-depot-tools' - waitFor: ['clone-depot-tools'] - entrypoint: 'bash' - args: - - '-c' - - | - echo "export PATH=/workspace/depot_tools:$PATH" >> ~/.bashrc - source ~/.bashrc +# 3. Fetch the Code +- name: 'ubuntu' + id: 'configure-gclient' + waitFor: [ 'fetch-code' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium + gclient config --unmanaged --name src \ + --custom-var build_with_hopium=True \ + --custom-var checkout_pgo_profiles=True \ + git@github.com:protectednet/hopium.git + env: + - 'PATH=/workspace/depot_tools:$PATH' - # 3. Fetch the Code - - name: 'ubuntu' - id: 'configure-gclient' - waitFor: [ 'fetch-code' ] - entrypoint: 'bash' - args: - - '-c' - - | - cd /workspace/hopium - gclient config --unmanaged --name src \ - --custom-var build_with_hopium=True \ - --custom-var checkout_pgo_profiles=True \ - git@github.com:protectednet/hopium.git +- name: 'ubuntu' + id: 'sync-deps' + waitFor: [ 'configure-gclient' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium + gclient sync -r $TAG_NAME + env: + - 'PATH=/workspace/depot_tools:$PATH' - - name: 'ubuntu' - id: 'sync-deps' - waitFor: [ 'configure-gclient' ] - entrypoint: 'bash' - args: - - '-c' - - | - cd /workspace/hopium - gclient sync -r $TAG_NAME +- name: 'ubuntu' + id: 'checkout-branch' + waitFor: [ 'sync-deps' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium/src + git checkout $TAG_NAME + gclient sync -D + env: + - 'PATH=/workspace/depot_tools:$PATH' - - name: 'ubuntu' - id: 'checkout-branch' - waitFor: [ 'sync-deps' ] - entrypoint: 'bash' - args: - - '-c' - - | - cd /workspace/hopium/src - git checkout $TAG_NAME - gclient sync -D +# 4. Configure & Build +- name: 'ubuntu' + id: 'configure-build' + waitFor: [ 'checkout-branch' ] + entrypoint: 'bash' + args: + - '-c' + - | + cd /workspace/hopium/src + gn args out/Debug < Date: Thu, 20 Mar 2025 15:55:20 +0000 Subject: [PATCH 05/68] fix path export --- cloudbuild.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index a9f7c2e8980904..477247ef706c8c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -30,7 +30,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git env: - - 'PATH=/workspace/depot_tools:$PATH' + - 'PATH=/workspace/depot_tools:\$PATH' - name: 'ubuntu' id: 'sync-deps' @@ -42,7 +42,7 @@ steps: cd /workspace/hopium gclient sync -r $TAG_NAME env: - - 'PATH=/workspace/depot_tools:$PATH' + - 'PATH=/workspace/depot_tools:\$PATH' - name: 'ubuntu' id: 'checkout-branch' @@ -55,7 +55,7 @@ steps: git checkout $TAG_NAME gclient sync -D env: - - 'PATH=/workspace/depot_tools:$PATH' + - 'PATH=/workspace/depot_tools:\$PATH' # 4. Configure & Build - name: 'ubuntu' From cff6ff96f91a1a2225c3391aacd99fa62f7d0de0 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 20 Mar 2025 16:27:25 +0000 Subject: [PATCH 06/68] fix substitutions conflict --- cloudbuild.yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 477247ef706c8c..6669c73d22cccb 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -19,18 +19,16 @@ steps: # 3. Fetch the Code - name: 'ubuntu' id: 'configure-gclient' - waitFor: [ 'fetch-code' ] + waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' args: - '-c' - | cd /workspace/hopium - gclient config --unmanaged --name src \ + /workspace/depot_tools/gclient config --unmanaged --name src \ --custom-var build_with_hopium=True \ --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - env: - - 'PATH=/workspace/depot_tools:\$PATH' - name: 'ubuntu' id: 'sync-deps' @@ -40,9 +38,7 @@ steps: - '-c' - | cd /workspace/hopium - gclient sync -r $TAG_NAME - env: - - 'PATH=/workspace/depot_tools:\$PATH' + /workspace/depot_tools/gclient sync -r $TAG_NAME - name: 'ubuntu' id: 'checkout-branch' @@ -53,9 +49,7 @@ steps: - | cd /workspace/hopium/src git checkout $TAG_NAME - gclient sync -D - env: - - 'PATH=/workspace/depot_tools:\$PATH' + /workspace/depot_tools/gclient sync -D # 4. Configure & Build - name: 'ubuntu' @@ -119,4 +113,4 @@ steps: - name: 'gcr.io/cloud-builders/gsutil' id: 'upload-artifact' waitFor: [ 'verify-binary' ] - args: ['cp', '-r', '/workspace/hopium/src/out/Debug/TotalBrowser', 'gs://tmp_tbr_build_output_bucket/$TAG'] + args: ['cp', '-r', '/workspace/hopium/src/out/Debug/TotalBrowser', 'gs://tmp_tbr_build_output_bucket/$TAG_NAME'] From 3c96b1cf0ad5fed27869da6ae5798f57c8da2268 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 21 Mar 2025 11:30:32 +0000 Subject: [PATCH 07/68] fix Install Dependencies steps --- cloudbuild.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 6669c73d22cccb..97febed6933e95 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -7,9 +7,19 @@ options: steps: # 1. Install Dependencies -- name: 'gcr.io/cloud-builders/apt' +- name: 'ubuntu' id: 'install-deps' - args: ['install', '-y', 'git', 'python3', 'curl', 'ninja-build', 'pkg-config', 'libnss3-dev', 'libssl-dev'] + args: + - '-c' + - | + apt update -y + install -y git \ + python3 \ + curl \ + ninja-build \ + pkg-config \ + libnss3-dev \ + libssl-dev # 2. Install Depot Tools - name: 'gcr.io/cloud-builders/git' From 1d79def3f432d7e0328c69840af9bd66e91ecd9a Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 21 Mar 2025 11:35:46 +0000 Subject: [PATCH 08/68] fix Install Dependencies steps --- cloudbuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 97febed6933e95..9485073a0b71f6 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -9,6 +9,7 @@ steps: # 1. Install Dependencies - name: 'ubuntu' id: 'install-deps' + entrypoint: 'bash' args: - '-c' - | From 996a35c3fd15a86b71698f63e3eea814c181e1b1 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 21 Mar 2025 11:41:29 +0000 Subject: [PATCH 09/68] fix typo --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 9485073a0b71f6..b04b9ce1270bbd 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -14,7 +14,7 @@ steps: - '-c' - | apt update -y - install -y git \ + apt install -y git \ python3 \ curl \ ninja-build \ From 82da99222164ee4d5c403f94065e5daede5fcbd6 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 21 Mar 2025 12:17:16 +0000 Subject: [PATCH 10/68] fixed install deps step --- cloudbuild.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b04b9ce1270bbd..222309d9d12d34 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -13,14 +13,16 @@ steps: args: - '-c' - | - apt update -y - apt install -y git \ - python3 \ - curl \ - ninja-build \ - pkg-config \ - libnss3-dev \ - libssl-dev + sudo apt update -y && sudo apt install -y \ + git \ + python3 \ + curl \ + ninja-build \ + pkg-config \ + libnss3-dev \ + libssl-dev + env: + DEBIAN_FRONTEND: noninteractive # 2. Install Depot Tools - name: 'gcr.io/cloud-builders/git' From 8d5908118abe9707d3b52d24b60e9dd0a23c051d Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 21 Mar 2025 12:18:57 +0000 Subject: [PATCH 11/68] fixed install deps step --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 222309d9d12d34..fa2d12989df73f 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -22,7 +22,7 @@ steps: libnss3-dev \ libssl-dev env: - DEBIAN_FRONTEND: noninteractive + - "DEBIAN_FRONTEND=noninteractive" # 2. Install Depot Tools - name: 'gcr.io/cloud-builders/git' From aaab40574eec8725f1229c62154ec02eb8264e5d Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 21 Mar 2025 13:32:08 +0000 Subject: [PATCH 12/68] fixed install deps step --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index fa2d12989df73f..52602c5443a2b5 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -13,7 +13,7 @@ steps: args: - '-c' - | - sudo apt update -y && sudo apt install -y \ + apt update -y && apt install -y \ git \ python3 \ curl \ From ade3e1928982788b1f0c9ea19c8e7d8417934bbd Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 14:16:32 +0000 Subject: [PATCH 13/68] use custom cloudbuild runners for build steps --- cloudbuild.yaml | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 52602c5443a2b5..87ad33bf748b29 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -6,31 +6,13 @@ options: logging: 'CLOUD_LOGGING_ONLY' steps: -# 1. Install Dependencies -- name: 'ubuntu' - id: 'install-deps' - entrypoint: 'bash' - args: - - '-c' - - | - apt update -y && apt install -y \ - git \ - python3 \ - curl \ - ninja-build \ - pkg-config \ - libnss3-dev \ - libssl-dev - env: - - "DEBIAN_FRONTEND=noninteractive" - -# 2. Install Depot Tools +# 1. Install Depot Tools - name: 'gcr.io/cloud-builders/git' id: 'clone-depot-tools' args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] -# 3. Fetch the Code -- name: 'ubuntu' +# 2. Fetch the Code +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -43,7 +25,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git -- name: 'ubuntu' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -53,7 +35,7 @@ steps: cd /workspace/hopium /workspace/depot_tools/gclient sync -r $TAG_NAME -- name: 'ubuntu' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -64,8 +46,8 @@ steps: git checkout $TAG_NAME /workspace/depot_tools/gclient sync -D -# 4. Configure & Build -- name: 'ubuntu' +# 3. Configure & Build +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -91,7 +73,7 @@ steps: enable_media_foundation = true EOF -- name: 'ubuntu' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -101,7 +83,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser -- name: 'ubuntu' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -111,8 +93,8 @@ steps: cd /workspace/hopium/src autoninja -C out/Debug chrome -j 32 -# 5. Post-Build Verification -- name: 'ubuntu' +# 4. Post-Build Verification +- name: 'gcr.io/protected-app-builds/totalbrowser-builder' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' @@ -122,7 +104,7 @@ steps: ls -lh /workspace/hopium/src/out/Debug -# 6. Store Build Artifacts +# 5. Store Build Artifacts - name: 'gcr.io/cloud-builders/gsutil' id: 'upload-artifact' waitFor: [ 'verify-binary' ] From acf76a6b62da9d327f61d713a4ad089fde0c0151 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 14:30:30 +0000 Subject: [PATCH 14/68] specify totalbrowser-builder image tag --- cloudbuild.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 87ad33bf748b29..bd2f0dcf11e972 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,7 +12,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 2. Fetch the Code -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -25,7 +25,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -35,7 +35,7 @@ steps: cd /workspace/hopium /workspace/depot_tools/gclient sync -r $TAG_NAME -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -47,7 +47,7 @@ steps: /workspace/depot_tools/gclient sync -D # 3. Configure & Build -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -73,7 +73,7 @@ steps: enable_media_foundation = true EOF -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -83,7 +83,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -94,7 +94,7 @@ steps: autoninja -C out/Debug chrome -j 32 # 4. Post-Build Verification -- name: 'gcr.io/protected-app-builds/totalbrowser-builder' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From d206c425fa7a20f543772a546e71473e63b32afe Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 14:37:42 +0000 Subject: [PATCH 15/68] use sh entrypoint not bash for alpine images --- cloudbuild.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index bd2f0dcf11e972..892881cc44cd32 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -15,7 +15,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | @@ -28,7 +28,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'sync-deps' waitFor: [ 'configure-gclient' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | @@ -38,7 +38,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'checkout-branch' waitFor: [ 'sync-deps' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | @@ -50,7 +50,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'configure-build' waitFor: [ 'checkout-branch' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | @@ -76,7 +76,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'branding-script' waitFor: [ 'configure-build' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | @@ -86,7 +86,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'build-browser' waitFor: [ 'branding-script' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | @@ -97,7 +97,7 @@ steps: - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' id: 'verify-binary' waitFor: [ 'build-browser' ] - entrypoint: 'bash' + entrypoint: 'sh' args: - '-c' - | From 0a88fd845b2a03d245583a9785faba347789a4ff Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 14:48:16 +0000 Subject: [PATCH 16/68] make sure workdir is created --- cloudbuild.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 892881cc44cd32..b85c2fe82f2d78 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -19,6 +19,8 @@ steps: args: - '-c' - | + set -e + mkdir /workspace/hopium cd /workspace/hopium /workspace/depot_tools/gclient config --unmanaged --name src \ --custom-var build_with_hopium=True \ @@ -32,6 +34,7 @@ steps: args: - '-c' - | + set -e cd /workspace/hopium /workspace/depot_tools/gclient sync -r $TAG_NAME @@ -42,6 +45,7 @@ steps: args: - '-c' - | + set -e cd /workspace/hopium/src git checkout $TAG_NAME /workspace/depot_tools/gclient sync -D @@ -54,6 +58,7 @@ steps: args: - '-c' - | + set -e cd /workspace/hopium/src gn args out/Debug < Date: Wed, 26 Mar 2025 15:21:22 +0000 Subject: [PATCH 17/68] updated builder images to use ubuntu --- cloudbuild.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b85c2fe82f2d78..10f6d42f8cfcdc 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,10 +12,10 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 2. Fetch the Code -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | @@ -27,10 +27,10 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'sync-deps' waitFor: [ 'configure-gclient' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | @@ -38,10 +38,10 @@ steps: cd /workspace/hopium /workspace/depot_tools/gclient sync -r $TAG_NAME -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'checkout-branch' waitFor: [ 'sync-deps' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | @@ -51,10 +51,10 @@ steps: /workspace/depot_tools/gclient sync -D # 3. Configure & Build -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'configure-build' waitFor: [ 'checkout-branch' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | @@ -78,10 +78,10 @@ steps: enable_media_foundation = true EOF -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'branding-script' waitFor: [ 'configure-build' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | @@ -89,10 +89,10 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'build-browser' waitFor: [ 'branding-script' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | @@ -101,10 +101,10 @@ steps: autoninja -C out/Debug chrome -j 32 # 4. Post-Build Verification -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.2' +- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'verify-binary' waitFor: [ 'build-browser' ] - entrypoint: 'sh' + entrypoint: 'bash' args: - '-c' - | From b3aa355f628036f6de5c042abb486a636942af7b Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 17:45:20 +0000 Subject: [PATCH 18/68] fix failed github auth --- cloudbuild.yaml | 234 +++++++++++++++++++++++++++--------------------- id_rsa.enc | Bin 0 -> 3484 bytes 2 files changed, 134 insertions(+), 100 deletions(-) create mode 100644 id_rsa.enc diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 10f6d42f8cfcdc..174b843ccb33ce 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -6,114 +6,148 @@ options: logging: 'CLOUD_LOGGING_ONLY' steps: -# 1. Install Depot Tools -- name: 'gcr.io/cloud-builders/git' - id: 'clone-depot-tools' - args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] + # 1. Prepare the workspace + - name: gcr.io/cloud-builders/gcloud + id: 'sshkey' + args: + - kms + - decrypt + - "--plaintext-file=/root/.ssh/id_rsa" + - "--ciphertext-file=id_rsa.enc" + - "--location=global" + - "--keyring=builder-keyring" + - "--key=ssh-key" + - "--project=protected-registry" + volumes: + - name: ssh + path: "/root/.ssh" -# 2. Fetch the Code -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' - id: 'configure-gclient' - waitFor: [ 'clone-depot-tools' ] - entrypoint: 'bash' - args: + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + id: 'sync-deps' + waitFor: [ 'configure-gclient' ] + entrypoint: 'bash' + args: - '-c' - | - set -e - mkdir /workspace/hopium - cd /workspace/hopium - /workspace/depot_tools/gclient config --unmanaged --name src \ - --custom-var build_with_hopium=True \ - --custom-var checkout_pgo_profiles=True \ - git@github.com:protectednet/hopium.git + set -e + chmod 0600 /root/.ssh/id_rsa + + echo 'Host github.com + HostName github.com + IdentityFile /root/.ssh/id_rsa + User git + IdentitiesOnly yes' >> /root/.ssh/config + + ssh-keyscan -H github.com > /root/.ssh/known_hosts -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' - id: 'sync-deps' - waitFor: [ 'configure-gclient' ] - entrypoint: 'bash' - args: - - '-c' - - | - set -e - cd /workspace/hopium - /workspace/depot_tools/gclient sync -r $TAG_NAME + # 2. Install Depot Tools + - name: 'gcr.io/cloud-builders/git' + id: 'clone-depot-tools' + args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' - id: 'checkout-branch' - waitFor: [ 'sync-deps' ] - entrypoint: 'bash' - args: - - '-c' - - | - set -e - cd /workspace/hopium/src - git checkout $TAG_NAME - /workspace/depot_tools/gclient sync -D + # 3. Fetch the Code + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + id: 'configure-gclient' + waitFor: [ 'clone-depot-tools' ] + entrypoint: 'bash' + args: + - '-c' + - | + set -e + mkdir /workspace/hopium + cd /workspace/hopium + /workspace/depot_tools/gclient config --unmanaged --name src \ + --custom-var build_with_hopium=True \ + --custom-var checkout_pgo_profiles=True \ + git@github.com:protectednet/hopium.git -# 3. Configure & Build -- name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' - id: 'configure-build' - waitFor: [ 'checkout-branch' ] - entrypoint: 'bash' - args: - - '-c' - - | - set -e - cd /workspace/hopium/src - gn args out/Debug <pKsn=1m%v{_3s}5NR{!QYPxadg`MgN$rAG#0F2VI zAi?IRvwVl+LNyR$CgHV!4R_pgJ3+vN0o4-tYSa#^Z(FC@iA9(ZWH1^fW|1bF{X)>HT{j)_f!ku{b_=B5xdTkc)l_)+V9+IZD;W+xKMY{Z&;s)Q;1zC zc>2`C_;~}(<*F7qL!;R`tGI|m*?Un2L=k}QaIS^6Eia=nH0?MnhZ1Sji9(4?G!+xl ziL2_DGbUwK0c0?v7-|CayUNgoZjoaK6=2%#Z?EGwp3)wpX9Cj*IDIsTbk=BUg1zKV zVOhrxi7_;1o8-Qg5Ku48Fy=1T{*o*n2#;=guO0?LOiTC#%BvY@k&@KH3EgL5!(~yc*R)) zmXCKCK^tkV^?a-A4f=!Buj2mPLPp?8=c;Wa%C(mh%Vzwol!jx265tu5mX&yLI(o6D z`IsM!4GPie32u*ZP*chj(ebi%W!*@UA^;AKHaF;!eK4K zrcIUAi%YbT540T`=&j!@FcMXmlrPb-oDs$emp~P)6`u#VRQy1`=0AVxx}3l5}`9mIjIK?L5x~m^jg{76i$_iuk%FaRlo>lxUf2){4GiOU-|fa?CQhe z`&@at_-YUaN&l4og~-T9Q*cGzYu2E>byG+I9x^ z7aj2F*lu;S%B}-X18;}v)!ysGJAWG z5WlR4(cy}B>$5yvU=5TVgbF%LiS;r%1g!O^vgS|sgs_-mk2pK$u#2^D>CMd#un!cg z`d(6};eh3dWJ4M^BGv1Lqj2xwodCDV$5kVrY|v1%3g?ha6a1k8mF??MHv3qtRXbJgn5jC6Z_#8si_yAw*Fe}05qt2st{Z7`V1!F_7XnMA;27`wS zya@?=#Uz^Bm@m0>{&j4~A;+B9V!G>m&hkbiFhDW@ZjFE@W|({v*bq0+`!>_N; zBXuYUBmmE;A=V;g9Odh;lXP!5>`pTbX)@>2m?(5kN~|DSq%i`fk#SyX0{n3h-P+Bi9~Xxvn82LC5xcduirie8Cs zR#1Y${kEZO_VpPZ$7SARpOrLYJmAw%z6D8-g-yF2{WJ`SbD$wQjlJ|{T7;Ds$Sk&#I*eU>`#ntL2TFEC-*=Xh_LzR2(}~rFB=POZc1@vQX(N1 z&?=`-!OJrred|#F`SI(h9$pBPgMyZTQ&vo!uFviVBoLH4<$?pPP#P=|`=z%;y*k*6 z$wz|toC;G+ug67^jIdk!`5&`_-5WC!L?QgOHI?fH-(I>*_L8V*X}0hJeas_2?#Ws$ z*&N*iqQ=^+FI{5oxHx=~6-y`yfdv2+^%+Ep5=$GBeHUX7so9&(py)4bt8$Th@hBU`cpF1Q#iB&xJZgM^w`lHg@~LH~9&PChB26g1h;u__ z{pnKPE$(o&!zk>$DCZ(8RkD#<33|c=pF<49U>x{n(gO*`RC#hxxX)aPffZ&Q=i$iw zqU-D-f|VBiOPWSiM7YKBsN!B0UBKa$M3bMG{O@_?b7tNdc5#z?^HN=jUH^MFtFqV@ zCVX$mH7%74L?PKwvP81C9f$rS+mmj*f zb;sFM$YZ zg6#7ij;D#Jo88raz;dlD-7X$K_|Vvm&P-Oy#%)eP79Fm$=e3W%SMN?be+vz z(kh|7$hA&a-fH~18oKz4CLEeV-q)G(wi50OUNZlJ)ymVX)_>k z@vD&Pzm-LDf$3(KGuS&5a%+y-WUp(j3DQma@+zleYnJpA>!5CT82nM$129>72YV?Q zeDIqMgN<8hNF_06?M}E_2J~R#H(fgMHEwA!xDvt_awui*Lg>n3w!|I~p;VCc^h%PX zF*~$P;zCxTZQquy_g*0y02_Z~={*>See1Ww_KTinc~#JdWyMU7Fy#O$rsaIyXw~;g zIT%++W3a`sK#QA;=lG;IO6~t#>PTRuotg6${;Aa@B&mpy6rd)N6NrLeM#4Z@zdIne zHTOmVqn3-6!tR^%GT!($erxl9F+sTeMta*{Z=g1!Ju1DhNP>J%Lp#x z5GuD@JCmHTn1|-9!+G~Mk>0B(Z_dg|a!x`_KNI~BxwY_b+MZecJbmefXp4iwInzKU zSYaG^cuSKsYsZ}KEU<6svdR7&dHmd|x{H3Pp(MvMWFG%rFPo&Oazhw+Ogg-AA_Lj& zKFKqIwU5%=B9%B|J1&!*T{K-hNqt@fC09#VM4Di;lby!tLcv}1cz{aMdrmnL9u4Lz K@6v{J1oHZbAKf4T literal 0 HcmV?d00001 From e3f2ea798c67b0f7346b861bde964ba65aa26159 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 17:47:53 +0000 Subject: [PATCH 19/68] fix typo --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 174b843ccb33ce..79a1cb5c6fd3fb 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,8 +23,8 @@ steps: path: "/root/.ssh" - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' - id: 'sync-deps' - waitFor: [ 'configure-gclient' ] + id: 'prepare' + waitFor: [ 'sshkey' ] entrypoint: 'bash' args: - '-c' From e9bcc5a61cda3c6c1491f0f4d0d8e7543bc41c97 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 26 Mar 2025 17:49:04 +0000 Subject: [PATCH 20/68] fix typo --- cloudbuild.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 79a1cb5c6fd3fb..917053cf50c56e 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -71,6 +71,9 @@ steps: set -e cd /workspace/hopium /workspace/depot_tools/gclient sync -r $TAG_NAME + volumes: + - name: ssh + path: "/root/.ssh" - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'checkout-branch' @@ -83,6 +86,9 @@ steps: cd /workspace/hopium/src git checkout $TAG_NAME /workspace/depot_tools/gclient sync -D + volumes: + - name: ssh + path: "/root/.ssh" # 4. Configure & Build - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' From 386b60153ecbc711edba3819088f68b53e562c1b Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 27 Mar 2025 09:59:59 +0000 Subject: [PATCH 21/68] added missing volume --- cloudbuild.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 917053cf50c56e..58294aed665df0 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -39,6 +39,9 @@ steps: IdentitiesOnly yes' >> /root/.ssh/config ssh-keyscan -H github.com > /root/.ssh/known_hosts + volumes: + - name: ssh + path: "/root/.ssh" # 2. Install Depot Tools - name: 'gcr.io/cloud-builders/git' From 6fc4569bbe88912f0e6d1be3b32e8be47b4f18c1 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 27 Mar 2025 15:33:21 +0000 Subject: [PATCH 22/68] use full path when using gn --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 58294aed665df0..03ce8040b9d283 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -73,7 +73,7 @@ steps: - | set -e cd /workspace/hopium - /workspace/depot_tools/gclient sync -r $TAG_NAME + /workspace/depot_tools/gclient sync -v -r $TAG_NAME volumes: - name: ssh path: "/root/.ssh" @@ -103,7 +103,7 @@ steps: - | set -e cd /workspace/hopium/src - gn args out/Debug < Date: Thu, 27 Mar 2025 16:22:16 +0000 Subject: [PATCH 23/68] Pre-create the args.gn file for gn --- cloudbuild.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 03ce8040b9d283..8d8977c449f918 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -103,6 +103,8 @@ steps: - | set -e cd /workspace/hopium/src + mkdir -p out/Debug + touch out/Debug/args.gn /workspace/depot_tools/gn args out/Debug < Date: Fri, 28 Mar 2025 09:51:19 +0000 Subject: [PATCH 24/68] fix gn gen arg specification --- cloudbuild.yaml | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 8d8977c449f918..bc85241ff2e6dc 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -103,25 +103,30 @@ steps: - | set -e cd /workspace/hopium/src - mkdir -p out/Debug - touch out/Debug/args.gn - /workspace/depot_tools/gn args out/Debug < Date: Fri, 28 Mar 2025 10:00:50 +0000 Subject: [PATCH 25/68] fix gn gen arg specification --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index bc85241ff2e6dc..51ebff845ad8c0 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -105,7 +105,7 @@ steps: cd /workspace/hopium/src # Define args - GN_ARGS_MULTILINE=$(cat < Date: Fri, 28 Mar 2025 10:04:42 +0000 Subject: [PATCH 26/68] fix gn gen arg specification --- cloudbuild.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 51ebff845ad8c0..f87a949ca3e0d0 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -101,11 +101,14 @@ steps: args: - '-c' - | + export PATH="/workspace/depot_tools:$PATH" + # Set EDITOR to a command that does nothing and exits successfully + export EDITOR=/bin/true set -e cd /workspace/hopium/src - # Define args - GN_ARGS_MULTILINE=$$(cat < Date: Fri, 28 Mar 2025 10:05:37 +0000 Subject: [PATCH 27/68] fix gn gen arg specification --- cloudbuild.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index f87a949ca3e0d0..588918b4c410c1 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -101,7 +101,6 @@ steps: args: - '-c' - | - export PATH="/workspace/depot_tools:$PATH" # Set EDITOR to a command that does nothing and exits successfully export EDITOR=/bin/true set -e From 559ea71cfd6405627ab04c6c08eea5b590c6b877 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 28 Mar 2025 10:52:01 +0000 Subject: [PATCH 28/68] fix gn gen arg specification --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 588918b4c410c1..eb13942a19b4e6 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -107,7 +107,7 @@ steps: cd /workspace/hopium/src mkdir -p out/Debug - gn args out/Debug < Date: Fri, 28 Mar 2025 11:48:29 +0000 Subject: [PATCH 29/68] fix branding script step --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index eb13942a19b4e6..268153a8690e06 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -133,7 +133,7 @@ steps: - '-c' - | set -e - cd /workspace/hopium/src + cd /workspace python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' From ccd5bd4600010c14d82355648c7eb9ad7a0b3715 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Mon, 31 Mar 2025 09:53:06 +0100 Subject: [PATCH 30/68] run branding-script step from correct dir --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 268153a8690e06..eb13942a19b4e6 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -133,7 +133,7 @@ steps: - '-c' - | set -e - cd /workspace + cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' From a300c391d925e5a0d3b5a78ae509c6e4537cc126 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Mon, 31 Mar 2025 14:39:30 +0100 Subject: [PATCH 31/68] add step to verify branding-script has been generated --- cloudbuild.yaml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index eb13942a19b4e6..afad22a2eb433a 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -59,10 +59,7 @@ steps: set -e mkdir /workspace/hopium cd /workspace/hopium - /workspace/depot_tools/gclient config --unmanaged --name src \ - --custom-var build_with_hopium=True \ - --custom-var checkout_pgo_profiles=True \ - git@github.com:protectednet/hopium.git + ~/workspace/depot_tools/gclient config --unmanaged --name src --custom-var build_with_hopium=True --custom-var checkout_pgo_profiles=True git@github.com:protectednet/hopium.git - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'sync-deps' @@ -125,9 +122,27 @@ steps: enable_media_foundation=true EOF + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + id: 'verify-files' + waitFor: ['configure-build'] + entrypoint: 'bash' + args: + - '-c' + - | + set -e + echo "Listing all files in /workspace/hopium/src:" + ls -R /workspace/hopium/src + echo "---" + echo "Attempting to find pre_rebrand.py recursively (for debugging):" + find /workspace/hopium/src -name 'pre_rebrand.py' -ls || echo "pre_rebrand.py not found anywhere in /workspace/hopium/src" + echo "---" + echo "Checking specifically for the required file at the expected location:" + ls -lh /workspace/hopium/src/hopium/tsec_branding/pre_rebrand.py + echo "Verification step completed." + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'branding-script' - waitFor: [ 'configure-build' ] + waitFor: [ 'verify-files' ] entrypoint: 'bash' args: - '-c' From cf6077a92480a9b3b075a07d9aaa31f8d1d3a05f Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Mon, 31 Mar 2025 16:03:37 +0100 Subject: [PATCH 32/68] fixed typo --- cloudbuild.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index afad22a2eb433a..fe8887d3963348 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -59,7 +59,10 @@ steps: set -e mkdir /workspace/hopium cd /workspace/hopium - ~/workspace/depot_tools/gclient config --unmanaged --name src --custom-var build_with_hopium=True --custom-var checkout_pgo_profiles=True git@github.com:protectednet/hopium.git + /workspace/depot_tools/gclient config --unmanaged --name src \ + --custom-var build_with_hopium=True \ + --custom-var checkout_pgo_profiles=True \ + git@github.com:protectednet/hopium.git - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'sync-deps' From 50911948480a27da41b2ff77767dfdd99c2ad112 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Mon, 14 Apr 2025 10:12:47 +0100 Subject: [PATCH 33/68] added missing deps --- DEPS | 4498 +++++++++++++++++++++++------------------------ cloudbuild.yaml | 20 +- 2 files changed, 2203 insertions(+), 2315 deletions(-) diff --git a/DEPS b/DEPS index 75e932c37cfbf1..b3ab838cad64a0 100644 --- a/DEPS +++ b/DEPS @@ -17,7 +17,7 @@ # # # Create and switch to a new branch # git new-branch depsroll -# # Run roll-dep (provided by depot_tools) giving the dep's path and optionally +# # Run roll-dep (provided by depot_tools) giving the dep's path and # # a regex that will match the line in this file that contains the current # # revision. The script ALWAYS rolls the dependency to the latest revision # # in origin/master. The path for the dep should start with src/. @@ -32,17 +32,21 @@ # which is a bit incomplete but the best documentation we have at the # moment. +# We expect all git dependencies specified in this file to be in sync with git +# submodules (gitlinks). +git_dependencies = 'SYNC' + gclient_gn_args_file = 'src/build/config/gclient_args.gni' gclient_gn_args = [ + 'build_with_hopium', 'build_with_chromium', 'checkout_android', 'checkout_android_prebuilts_build_tools', - 'checkout_android_native_support', 'checkout_clang_coverage_tools', + 'checkout_copybara', 'checkout_ios_webkit', 'checkout_nacl', 'checkout_openxr', - 'checkout_rts_model', 'checkout_src_internal', 'cros_boards', 'cros_boards_with_qemu_images', @@ -51,6 +55,9 @@ gclient_gn_args = [ vars = { + # Build hopium tsec brand + 'build_with_hopium': False, + # 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. @@ -65,12 +72,12 @@ vars = { # By default, don't check out android. Will be overridden by gclient # variables. - # TODO(ehmaldonado): Remove this once the bug in gclient is fixed. + # TODO(crbug.com/875037): Remove this once the problem in gclient is fixed. 'checkout_android': False, # By default, don't check out Fuchsia. Will be overridden by gclient # variables. - # TODO(ehmaldonado): Remove this once the bug in gclient is fixed. + # TODO(crbug.com/875037): Remove this once the problem in gclient is fixed. 'checkout_fuchsia': False, # For code related to internal Fuchsia images. @@ -86,17 +93,9 @@ vars = { # Pull in Android prebuilts build tools so we can create Java xrefs 'checkout_android_prebuilts_build_tools': False, - # Pull in Android native toolchain dependencies for Chrome OS too, so we can - # build ARC++ support libraries. - 'checkout_android_native_support': 'checkout_android or checkout_chromeos', - # By default, do not check out Cast3P. 'checkout_cast3p': False, - # Check out all Chrome Cleaner deps. Set on the Chrome Cleaner builders. - # Requires access to partner-code.googlesource.com. - 'checkout_chrome_cleaner_internal': False, - # By default, do not check out Chromium autofill captured sites test # dependencies. These dependencies include very large numbers of very # large web capture files. Captured sites test dependencies are also @@ -117,14 +116,18 @@ vars = { # output. 'checkout_js_coverage_modules': True, - # Check out and download nacl by default, unless on an arm mac. + # Check out and download nacl for ChromeOS only. # This can be disabled e.g. with custom_vars. - 'checkout_nacl': 'not (host_os == "mac" and host_cpu == "arm64")', + 'checkout_nacl': 'checkout_chromeos', # By default, do not check out src-internal. This can be overridden e.g. with # custom_vars. 'checkout_src_internal': False, + # Condition used by a subset of official Chrome release builders. + # By default, do not check out release_scripts. + 'checkout_chrome_release_scripts': False, + # Checkout legacy src_internal. This variable is ignored if # checkout_src_internal is set as false. 'checkout_legacy_src_internal': True, @@ -158,19 +161,6 @@ vars = { # Fetch clangd into the same bin/ directory as our clang binary. 'checkout_clangd': False, - # Fetch prebuilt and prepackaged Bazel binary/executable. Bazel is currently - # only needed by `chromium/src/tools/rust/build_crubit.py` and therefore - # shouldn't be used outside of Chromium Rust Experiments project. - # Furthermore note that Bazel is only needed when building Crubit during Rust - # toolchain build (and is *not* needed during regular Chromium builds). - 'checkout_bazel': False, - - # Fetch Crubit support libraries in order to build ..._rs_api.rs and - # ..._rs_api_impl.cc that are generated by prebuilt (see - # tools/rust/build_crubit.py) Crubit tools during Chromium build (see - # also //build/rust/rs_bindings_from_cc.gni). - 'checkout_crubit': False, - # By default checkout the OpenXR loader library only on Windows and Android. # The OpenXR backend for VR in Chromium is currently only supported for these # platforms, but support for other platforms may be added in the future. @@ -193,7 +183,7 @@ vars = { # Available images: # Emulation: # - core.x64-dfv2 - # - terminal.qemu-x64 + # - terminal.x64 # - terminal.qemu-arm64 # - workstation.qemu-x64 # Hardware: @@ -203,19 +193,13 @@ vars = { # Since the images are hundreds of MB, default to only downloading the image # most commonly useful for developers. Bots and developers that need to use # other images can override this with additional images. - 'checkout_fuchsia_boot_images': "terminal.qemu-x64", + 'checkout_fuchsia_boot_images': "terminal.x64", 'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""', # By default, do not check out files required to run fuchsia tests in # qemu on linux-arm64 machines. 'checkout_fuchsia_for_arm64_host': False, - # Revision of Crubit (trunk on 2022-10-15). This should typically be the - # same as the revision specified in CRUBIT_REVISION in - # tools/rust/update_rust.py. More details and roll instructions can be - # found in tools/rust/README.md. - 'crubit_revision': 'f5cbdf4b54b0e6b9f63a4464a2c901c82e0f0209', - # By default, download the fuchsia sdk from the public sdk directory. 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/', @@ -230,20 +214,6 @@ vars = { 'checkout_simplechrome': '"{cros_boards}" != ""', 'checkout_simplechrome_with_vms': '"{cros_boards_with_qemu_images}" != ""', - # By default, do not check out versions of toolschains and sdks that are - # specifically only needed by Lacros. - 'checkout_lacros_sdk': False, - # To update the sdk version: - # 1 Choose a version that's not newer than the Ash side so it's thoroughly - # tested: - # https://chromium-review.googlesource.com/q/%2522Automated+Commit:+LKGM%2522+status:merged - # 2 CL description: - # Lacros SDK: Update version - # - # CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-amd64-generic-chrome-skylab - # CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-arm-generic-chrome-skylab - 'lacros_sdk_version': '15580.0.0', - # Generate location tag metadata to include in tests result data uploaded # to ResultDB. This isn't needed on some configs and the tool that generates # the data may not run on them, so we make it possible for this to be @@ -251,25 +221,19 @@ vars = { # via a GN build arg (tests_have_location_tags). 'generate_location_tags': True, + # By default, do not check out Copybara 3pp dependency that is specifically + # needed by Cronet gn2bp CI builder. + 'checkout_copybara': False, + # luci-go CIPD package version. # Make sure the revision is uploaded by infra-packagers builder. # https://ci.chromium.org/p/infra-internal/g/infra-packagers/console - 'luci_go': 'git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66', + 'luci_go': 'git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956', # This can be overridden, e.g. with custom_vars, to build clang from HEAD # instead of downloading the prebuilt pinned revision. 'llvm_force_head_revision': False, - # Fetch Rust toolchain. - 'checkout_rust': True, - - # See //docs/testing/regression-test-selection.md - # for info on RTS - 'checkout_rts_model': False, - - # Use the experimental version of the RTS model - 'checkout_rts_experimental_model': False, - # Make Dawn skip its standalone dependencies 'dawn_standalone': False, @@ -283,18 +247,24 @@ vars = { # reclient CIPD package 'reclient_package': 'infra/rbe/client/', # reclient CIPD package version - 'reclient_version': 're_client_version:0.113.0.8b45b89-gomaip', + 'reclient_version': 're_client_version:0.174.0.d516e7c7-gomaip', - # The path of the sysroots.json file. - # This is used by vendor builds like Electron. - 'sysroots_json_path': 'build/linux/sysroot_scripts/sysroots.json', + # screen-ai CIPD packages + 'screen_ai_linux': 'version:127.9', + 'screen_ai_macos_amd64': 'version:127.9', + 'screen_ai_macos_arm64': 'version:127.9', + 'screen_ai_windows_amd64': 'version:127.9', + 'screen_ai_windows_386': 'version:127.9', # siso CIPD package version. - 'siso_version': 'git_revision:07d585d17bdd3c521080e2aa5f7b9f6a12f18ded', + 'siso_version': 'git_revision:0721be7440a7c67f8369fcce1ca01932638641bb', # download libaom test data 'download_libaom_testdata': False, + # download libvpx test data + 'download_libvpx_testdata': False, + 'android_git': 'https://android.googlesource.com', 'aomedia_git': 'https://aomedia.googlesource.com', 'boringssl_git': 'https://boringssl.googlesource.com', @@ -306,42 +276,40 @@ vars = { 'skia_git': 'https://skia.googlesource.com', 'swiftshader_git': 'https://swiftshader.googlesource.com', 'webrtc_git': 'https://webrtc.googlesource.com', + 'hopium_git': 'https://github.com/protectednet', 'betocore_git': 'https://beto-core.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'src_internal_revision': '4e1a09949fa7f234d5fb696f9c4b7de702815e1f', + 'src_internal_revision': '014be7b57c088d653120c5997fea33b52107a768', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'd0c369eaa6373b5239ea56e71f51ecd319665af2', + 'skia_revision': 'b9b67f9b36dab35a507db53e33f4a485cafcd384', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '569c6b1c96ec2f6d4b23a103200d2ea09e93617b', + 'v8_revision': '4bd0d4731ea90ff9460eeb6d5cfc6cc1127363d3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '0ef565c50e043c90721aa681760b6ef002e04c88', + 'angle_revision': '51c42f178dc95a587cf0d9718f8ed401f414b4f2', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. - 'swiftshader_revision': '97bdc453fbedee92ed0fc7687544098efc821622', + 'swiftshader_revision': 'b99f866d5a5cbbbfc185bce80edfab11c1fad6aa', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': '7952b46ddd1db647dc618b5caf890706ec3bd6d7', + 'pdfium_revision': 'f6da7d235728aeaff6586d2190badfb4290a9979', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - # - # Note this revision should be updated with - # third_party/boringssl/roll_boringssl.py, not roll-dep. - 'boringssl_revision': 'b8e012e1ff736cc794273af4a7db521e6b18bcd5', + 'boringssl_revision': 'd4b6eb542d4fd109baacd550935efd00c521e674', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. - 'fuchsia_version': 'version:14.20230818.1.3', + 'fuchsia_version': 'version:26.20250117.5.1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. @@ -349,7 +317,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling googletest # and whatever else without interference from each other. - 'googletest_revision': 'af29db7ec28d6df1c7f0f745186884091e602e07', + 'googletest_revision': '2b6b042a77446ff322cd7522ca068d9f2a21c1d1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lighttpd # and whatever else without interference from each other. @@ -361,23 +329,23 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling NaCl # and whatever else without interference from each other. - 'nacl_revision': 'f9cb132c419b9e019853103e88c518026b9f5083', + 'nacl_revision': '6944e6b79dbd1b9776681c025bd4f4c281bb4791', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_revision': '97251fd5aa2a90041cf4f397a5e887b8d60ab0c2', + 'freetype_revision': 'a059b237bb01eb3e4f9f8b1618dda8c117498bab', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_testing_revision': '7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f', + 'freetype_testing_revision': '04fa94191645af39750f5eff0a66c49c5cb2c2cc', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling HarfBuzz # and whatever else without interference from each other. - 'harfbuzz_revision': 'db700b5670d9475cc8ed4880cc9447b232c5e432', + 'harfbuzz_revision': '1c249be96e27eafd15eb86d832b67fbc3751634b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Emoji Segmenter # and whatever else without interference from each other. - 'emoji_segmenter_revision': '9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e', + 'emoji_segmenter_revision': '955936be8b391e00835257059607d7c5b72ce744', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling OTS # and whatever else without interference from each other. @@ -385,27 +353,31 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '00c92993e3e33f83a1e43eaee5d05d111c64632d', + 'catapult_revision': 'b15611f18b506cf9dbc03e9bf87dbc8df549ccce', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling chromium_variations # and whatever else without interference from each other. - 'chromium_variations_revision': 'f6cad8e6a52ea2febc08d7c29ec701ee0b4fb7ed', + 'chromium_variations_revision': 'd66e3e79647b84e230bec45ffea13c456f4c01e3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling CrossBench # and whatever else without interference from each other. - 'crossbench_revision': '06981428c28d66678ebec13ca1fac3785cf51bb1', + 'crossbench_revision': 'ff0961f089effcbad9db2bc733812bb2ffb1a9e6', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. - 'libfuzzer_revision': '26cc39e59b2bf5cbc20486296248a842c536878d', + 'libfuzzer_revision': 'e31b99917861f891308269c36a32363b120126bb', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling fuzztest # and whatever else without interference from each other. - 'fuzztest_revision': 'c9bedad82d1a01341451a5343c860944ee21361b', + 'fuzztest_revision': '00edfa0dd94d7e00a89684e950015c30d3b7ae07', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling domato + # and whatever else without interference from each other. + 'domato_revision': '053714bccbda79cf76dac3fee48ab2b27f21925e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '5111ff483c1e4e585a4e9d91f23928a209484d4b', + 'devtools_frontend_revision': 'c6bb3b2ce900d42eefac9c72600ea69e74d40943', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -413,67 +385,75 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_build-tools_version # and whatever else without interference from each other. - 'android_sdk_build-tools_version': 'YK9Rzw3fDzMHVzatNN6VlyoD_81amLZpN1AbmkdOd6AC', + 'android_sdk_build-tools_version': 'DxwAZ3hD551Neu6ycuW5CPnXFrdleRBd93oX1eB_m9YC', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_emulator_version # and whatever else without interference from each other. 'android_sdk_emulator_version': '9lGp8nTUCRRWGMnI_96HcKfzjnxEJKUcfvfwmA3wXNkC', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_extras_version - # and whatever else without interference from each other. - 'android_sdk_extras_version': 'ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_patcher_version - # and whatever else without interference from each other. - 'android_sdk_patcher_version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C', - # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_platform-tools_version # and whatever else without interference from each other. - 'android_sdk_platform-tools_version': 'HWVsGs2HCKgSVv41FsOcsfJbNcB0UFiNrF6Tc4yRArYC', + 'android_sdk_platform-tools_version': 'WihaseZR6cojZbkzIqwGhpTp92ztaGfqq8njBU8eTXYC', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_platforms_version # and whatever else without interference from each other. - 'android_sdk_platforms_preview_version': 'YWMYkzyxGBgVsty0GhXL1oxbY0pGXQIgFc0Rh7ZMRPYC', + 'android_sdk_platforms_version': 'kIXA-9XuCfOESodXEdOBkW5f1ytrGWdbp3HFp1I8A_0C', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_platforms_version + # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'android_sdk_platforms_version': 'u-bhWbTME6u-DjypTgr3ZikCyeAeU6txkR9ET6Uudc8C', + 'dawn_revision': '4585c9495dd4c1958890921fa2abacd8546d088d', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_sources_version + # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'android_sdk_sources_version': '_a_BcnANjPYw5mSKlNHa7GFY8yc1kdqj2rmQgac7yUcC', + 'quiche_revision': '16535679768274d3061f1b991082a6a0c8fd1aac', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling feed + # the commit queue can handle CLs rolling ink # and whatever else without interference from each other. - 'dawn_revision': '092f3f12f369fe3d894f17bca1e9ed40a98bf3f5', + 'ink_revision': 'e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling feed + # the commit queue can handle CLs rolling ink_stroke_modeler # and whatever else without interference from each other. - 'quiche_revision': 'ba658fc677a78c2515fd1851526be5bea8fc74c4', + 'ink_stroke_modeler_revision': '0999e4cf816b42c770d07916698bce943b873048', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ios_webkit # and whatever else without interference from each other. - 'ios_webkit_revision': '59e9de61b7b36507836fa8b098e8839d7d995b13', + 'ios_webkit_revision': 'f8c0fe750d94b7db23d193c0b1f31858c2537620', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libexpat # and whatever else without interference from each other. - 'libexpat_revision': '441f98d02deafd9b090aea568282b28f66a50e36', + 'libexpat_revision': '624da0f593bb8d7e146b9f42b06d8e6c80d032a3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling wuffs # and whatever else without interference from each other. - 'wuffs_revision': 'fe9d08f2b6e80af691bfb1a718e144c49a1b9eba', + 'wuffs_revision': 'e3f919ccfe3ef542cfc983a82146070258fb57f8', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libavif # and whatever else without interference from each other. - 'libavif_revision': '676aded3501ff453c88a6d9ed1e5b4f33b458f3e', + 'libavif_revision': 'e7b34a1f5e9f7024d08311c7bae156061b889882', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling libavif + # the commit queue can handle CLs rolling crabbyavif + # and whatever else without interference from each other. + 'crabbyavif_revision': 'f2e7def8ec44946b499ff403904c4b869512d2aa', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling Speedometer v3.0 + # and whatever else without interference from each other. + 'speedometer_main_revision': 'd6b5ffea959ad31e231c203d7446bf8b39e987ce', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling Speedometer v3.0 # and whatever else without interference from each other. - 'libavifinfo_revision': '707919b2f8ac1920b2f7ae252c233f9c6dcf84e1', + 'speedometer_3.0_revision': '8d67f28d0281ac4330f283495b7f48286654ad7d', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling Speedometer v2.0 + # and whatever else without interference from each other. + 'speedometer_2.0_revision': '732af0dfe867f8815e662ac637357e55f285dbbb', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling Speedometer v2.1 + # and whatever else without interference from each other. + 'speedometer_2.1_revision': '8bf7946e39e47c875c00767177197aea5727e84a', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling nearby # and whatever else without interference from each other. - 'nearby_revision': 'ea7aa00e0cd99a0fab900ae55e727fd5acf672fd', + 'nearby_revision': '07db16d351c2bed4d921190ba50b57cc6e7fb2d7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling securemessage # and whatever else without interference from each other. @@ -485,7 +465,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'cros_components_revision': '043aec14671f160b9bf567749946068ef3603fa1', + 'cros_components_revision': '59dd6e3d06e111c6a3d323a92e6478b9bbf15915', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -493,39 +473,59 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libcxxabi_revision': '6a8358a1423aa37f33d87b300b634c067b2741c1', + 'libcxxabi_revision': '8205ccf0f23545ebcd8846363ea1d29e77917a22', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libunwind_revision': 'd92e619eaa12123a2c235f81c8b0399aafe49ddf', + 'libunwind_revision': 'e55d8cf51c6db1fdd4bb56c158945ec59772c8ee', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'clang_format_revision': 'e5337933f2951cacd3aeacd238ce4578163ca0b9', + 'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'highway_revision': '8f20644eca693cfb74aa795b0006b6779c370e7a', + 'highway_revision': '00fe003dac355b979f36157f9407c7c46448958e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ffmpeg # and whatever else without interference from each other. - 'ffmpeg_revision': '0ba37733400593b162e5ae9ff26b384cff49c250', + 'ffmpeg_revision': 'd10a0f8bf5ddcce572df95105152bc74041cae0c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling beto-core # and whatever else without interference from each other. - 'betocore_revision': 'b902b346037ea3f4aadf8177021f6f917b16e648', + 'betocore_revision': '89563fec14c756482afa08b016eeba9087c8d1e3', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling tsproxy + # and whatever else without interference from each other. + 'webpagereplay_revision': 'd812e180206934eb3b7ae411d82d61bc21c22f70', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling llvm-libc + # and whatever else without interference from each other. + 'llvm_libc_revision': '12809bfa855813dcef51871e2ee3155e53ed35ea', # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80', + 'libcxx_revision': '2e25154d49c29fa9aa42c30ad4a027bd30123434', # GN CIPD package version. - 'gn_version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', + 'gn_version': 'git_revision:ed1abc107815210dc66ec439542bee2f6cbabc00', + + # ninja CIPD package. + 'ninja_package': 'infra/3pp/tools/ninja/', # ninja CIPD package version. # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja - # This has to stay in sync with the version in src/third_party/ninja/README.chromium. - 'ninja_version': 'version:2@1.11.1.chromium.6', + 'ninja_version': 'version:3@1.12.1.chromium.4', + + # 'magic' variable to tell depot_tools that git submodules should be accepted + # but parity with DEPS file is expected. + 'SUBMODULE_MIGRATION': 'True', + + # condition to allowlist deps to be synced in Cider. Allowlisting is needed + # because not all deps are compatible with Cider. Once we migrate everything + # to be compatible we can get rid of this allowlisting mecahnism and remove + # this condition. Tracking bug for removing this condition: b/349365433 + 'non_git_source': 'True', } # Only these hosts are allowed for dependencies in this DEPS file. @@ -544,9 +544,458 @@ allowed_hosts = [ 'skia.googlesource.com', 'swiftshader.googlesource.com', 'webrtc.googlesource.com', + + # TODO(337061377): Move into a separate allowed gcs bucket list. + 'chromium-ads-detection', + 'chromium-browser-clang', + 'chromium-clang-format', + 'chromium-doclava', + 'chromium-nodejs', + 'chrome-linux-sysroot', + 'chromium-fonts', + 'chromium-style-perftest', + 'chromium-telemetry', + 'chromium-webrtc-resources', + 'perfetto', ] deps = { + # NPM dependencies for JavaScript code coverage. + 'src/third_party/js_code_coverage/node_modules': { + 'dep_type': 'gcs', + 'bucket': 'chromium-nodejs', + 'objects': [ + { + 'object_name': 'js_code_coverage/90d7a8ecae092222e585481b64e9928bcf4a689e723a0af4b94922280cd55a48', + 'sha256sum': '90d7a8ecae092222e585481b64e9928bcf4a689e723a0af4b94922280cd55a48', + 'size_bytes': 1472459, + 'generation': 1716929997740855 + } + ] + + }, + 'src/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, + }, + ], + }, + 'src/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, + }, + ], + }, + 'src/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, + }, + ], + }, + 'src/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, + }, + ], + }, + 'src/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, + }, + ], + }, + 'src/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, + }, + ], + }, + 'src/buildtools/win-format': { + 'bucket': 'chromium-clang-format', + 'condition': 'host_os == "win" and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'object_name': '49458d4c1e884a38308f8dc6a2c7eb55fc478755', + 'sha256sum': '2f964ea355762d28005568a1cf888114d13b18631c618543586fb40589a22224', + 'size_bytes': 3214848, + 'generation': 1699478813805380, + 'output_file': 'clang-format.exe', + }, + ], + }, + 'src/buildtools/mac-format': { + 'bucket': 'chromium-clang-format', + 'condition': 'host_os == "mac" and host_cpu == "x64" and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'object_name': '0b4bd257a1f4cd27d27d6919b0f9e52ecdfa8f1e', + 'sha256sum': '0f3c38a6af0a04fd4161f1948f02e83a8827727e77242d3b5b61ae4f009a270a', + 'size_bytes': 2869976, + 'generation': 1699478821342910, + 'output_file': 'clang-format', + }, + ], + }, + 'src/buildtools/mac_arm64-format': { + 'bucket': 'chromium-clang-format', + 'condition': 'host_os == "mac" and host_cpu == "arm64" and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'object_name': '96c34e77259c4cc1fc7bdf067fc058bfd341ab85', + 'sha256sum': '66c5243cd530702defcbe18dffdbed0da9a3d1474b158a949580f6d269fbac17', + 'size_bytes': 2847744, + 'generation': 1699478828600976, + 'output_file': 'clang-format', + }, + ], + }, + 'src/buildtools/linux64-format': { + 'bucket': 'chromium-clang-format', + 'condition': 'host_os == "linux" and non_git_source', + 'dep_type': 'gcs', + 'objects': [ + { + 'object_name': 'b42097ca924d1f1736a5a7806068fed9d7345eb4', + 'sha256sum': '82df59a7d4390892c3eeaf0c8bf626e2869f1138a6ad3eb90dd51da0011ba630', + 'size_bytes': 3539912, + 'generation': 1699478806427152, + 'output_file': 'clang-format', + }, + ], + }, + 'src/third_party/data_sharing_sdk': { + 'packages': [ + { + 'package': 'chrome_internal/third_party/google3/data_sharing_sdk', + 'version': 't4zrKEZELPq_k-Rpzny0GLUOdcv_03R5n2pC9zT22c4C', + }, + ], + 'condition': 'checkout_src_internal and non_git_source', + 'dep_type': 'cipd', + }, + # Pull down Node binaries for WebUI toolchain. + # The Linux binary is always downloaded regardless of host os and architecture + # since remote node actions run on Linux worker. + # See also //third_party/node/node.gni + 'src/third_party/node/linux': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-nodejs', + 'objects': [ + { + 'object_name': 'fa98c6432de572206bc5519f85e9c96bd518b039', + 'sha256sum': 'fb563633b5bfe2d4307075c54c6bb54664a3b5ec6bc811f5b15742720549007a', + 'size_bytes': 50288755, + 'generation': 1730835522207929, + 'output_file': 'node-linux-x64.tar.gz', + }, + ], + }, + # The Mac x64/arm64 binaries are downloaded regardless of host architecture + # since it's possible to cross-compile for the other architecture. This can + # cause problems for tests that use node if the test device architecture does + # not match the architecture of the compile machine. + 'src/third_party/node/mac': { + 'dep_type': 'gcs', + 'condition': 'host_os == "mac" and non_git_source', + 'bucket': 'chromium-nodejs', + 'objects': [ + { + 'object_name': '4c8952a65a1ce7a2e4cff6db68f9b7454c46349f', + 'sha256sum': 'fadb4530fbe6e35ed298848c66102a0aa7d92974789e6222c4eadee26a381e7e', + 'size_bytes': 45672893, + 'generation': 1730835514382259, + 'output_file': 'node-darwin-x64.tar.gz', + }, + ], + }, + 'src/third_party/node/mac_arm64': { + 'dep_type': 'gcs', + 'condition': 'host_os == "mac" and non_git_source', + 'bucket': 'chromium-nodejs', + 'objects': [ + { + 'object_name': '0886aa6a146cb5c213cb09b59ed1075982e4cb57', + 'sha256sum': 'd39e2d44d58bb89740b9aca1073959fc92edbdbbe810a5e48448e331cf72c196', + 'size_bytes': 44929037, + 'generation': 1730835518292126, + 'output_file': 'node-darwin-arm64.tar.gz', + }, + ], + }, + 'src/third_party/node/win': { + 'dep_type': 'gcs', + 'condition': 'host_os == "win" and non_git_source', + 'bucket': 'chromium-nodejs', + 'objects': [ + { + 'object_name': '907d7e104e7389dc74cec7d32527c1db704b7f96', + 'sha256sum': '7447c4ece014aa41fb2ff866c993c708e5a8213a00913cc2ac5049ea3ffc230d', + 'size_bytes': 80511640, + 'generation': 1730835526374028, + 'output_file': 'node.exe', + }, + ], + }, + # Pull down NPM dependencies for WebUI toolchain. + 'src/third_party/node/node_modules': { + 'bucket': 'chromium-nodejs', + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'objects': [ + { + 'object_name': '59332695e189485e2e2b06e60e4d49d3d54b8e92', + 'sha256sum': 'a40ca106fa4d6b25cd0a3bb1c74991666ae91e9b5335799f1243da41f6d782ab', + 'size_bytes': 9100683, + 'generation': 1736178718186041, + 'output_file': 'node_modules.tar.gz', + }, + ], + }, + 'src/third_party/llvm-build/Release+Asserts': { + 'dep_type': 'gcs', + 'bucket': 'chromium-browser-clang', + 'condition': 'not llvm_force_head_revision', + 'objects': [ + { + # The Android libclang_rt.builtins libraries are currently only included in the Linux clang package. + 'object_name': 'Linux_x64/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'e649b5ae7db215ede1d17d63e60f187c9773bc3bb465e4ff25148f58783c0588', + 'size_bytes': 54177680, + 'generation': 1736382900858370, + 'condition': '(host_os == "linux" or checkout_android) and non_git_source', + }, + { + 'object_name': 'Linux_x64/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '98aeee7a6ea7b555868c16d009f0232c421ef88cb5a6a60c38b78255dd4faced', + 'size_bytes': 13149440, + 'generation': 1736382900905802, + 'condition': 'host_os == "linux" and checkout_clang_tidy and non_git_source', + }, + { + 'object_name': 'Linux_x64/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '767ad010ec7d99a62a2c6535cca8f3bc55c4866b2619462fb303e0bc9a5f1977', + 'size_bytes': 27687240, + 'generation': 1736382900911727, + 'condition': 'host_os == "linux" and checkout_clangd and non_git_source', + }, + { + 'object_name': 'Linux_x64/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'b61cee4a240859bab2b541721a5afd8333c0fc4eea2e568a63cf71529efefa76', + 'size_bytes': 2289668, + 'generation': 1736382900990620, + 'condition': 'host_os == "linux" and checkout_clang_coverage_tools and non_git_source', + }, + { + 'object_name': 'Linux_x64/llvmobjdump-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'a2eb777a2013c9d647c957b9cbb3d3937b66c6443ed9118d8a1eeb3fea6250d3', + 'size_bytes': 5348020, + 'generation': 1736382900960786, + 'condition': '(checkout_linux or checkout_mac or checkout_android and host_os != "mac") and non_git_source', + }, + { + 'object_name': 'Mac/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '40b2964db638f50f62c410202a0e150809b521eab8d764344dfcc82ce2fedda1', + 'size_bytes': 49122796, + 'generation': 1736382902685415, + 'condition': 'host_os == "mac" and host_cpu == "x64"', + }, + { + 'object_name': 'Mac/clang-mac-runtime-library-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '6dd34f8c8b70a1bf1453a74204c62669abe84e8e7f9625cbc16327b3fab8b943', + 'size_bytes': 972748, + 'generation': 1736382909396308, + 'condition': 'checkout_mac and not host_os == "mac"', + }, + { + 'object_name': 'Mac/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '194df82314e98d9c2b8c3d0810706bdedcdd60997b622eea07a1628ab94f28c3', + 'size_bytes': 12765652, + 'generation': 1736382902742379, + 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_tidy', + }, + { + 'object_name': 'Mac/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'a151f0d3958c8f469339c57f60e336cbf066fa94c5c841ac6b8e05cd09077890', + 'size_bytes': 26561888, + 'generation': 1736382902744981, + 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clangd', + }, + { + 'object_name': 'Mac/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'e14e803b4841a7a392f960278e7225b61453f1cca3086e7cdfb1c3cee813a85d', + 'size_bytes': 2250480, + 'generation': 1736382902843064, + 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_coverage_tools', + }, + { + 'object_name': 'Mac_arm64/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '11238b743b1c3157b64f261118ee0884f5b7f5f9afc235d4c47c1afc52556b1b', + 'size_bytes': 43127752, + 'generation': 1736382911237265, + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + }, + { + 'object_name': 'Mac_arm64/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '00a42f1c03272d8f9e0c9531712110422936fb9365c66206becdc7dfa27500d8', + 'size_bytes': 11362620, + 'generation': 1736382911277357, + 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_tidy', + }, + { + 'object_name': 'Mac_arm64/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'eb2c179811101e49a6156b55624a6292688c0a4ef1e79d0b05ef03f2a17f405f', + 'size_bytes': 22998836, + 'generation': 1736382911247931, + 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clangd', + }, + { + 'object_name': 'Mac_arm64/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '9c06d812bf98fc1ca1de9afaf031efa2334b3c1039969ee90689a810726db83c', + 'size_bytes': 1977132, + 'generation': 1736382911314127, + 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_coverage_tools', + }, + { + 'object_name': 'Win/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '554d4d0b22b7c682dd05bb912b9f2c1a13248d38660f3f1e15444ef0970fb0e5', + 'size_bytes': 46344548, + 'generation': 1736382920155077, + 'condition': 'host_os == "win"', + }, + { + 'object_name': 'Win/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'fbb40ae15b7c2fc408d8329eb6274d3422c6fb4110f27655adb8cd642d7b62b5', + 'size_bytes': 12970212, + 'generation': 1736382920246226, + 'condition': 'host_os == "win" and checkout_clang_tidy', + }, + { + 'object_name': 'Win/clang-win-runtime-library-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '98a76f1ec725bbf112fe91ba007bc39ca1efe1f1923d1c5a7cf2812e8c34b218', + 'size_bytes': 2458356, + 'generation': 1736382926959753, + 'condition': 'checkout_win and not host_os == "win"', + }, + { + 'object_name': 'Win/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': 'f766b3623240184b7d668b8e4e9c6070f6c56ee676cfed9a98375653922ccda8', + 'size_bytes': 25602964, + 'generation': 1736382920261395, + 'condition': 'host_os == "win" and checkout_clangd', + }, + { + 'object_name': 'Win/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '7f23a02c44dac5fb1139cc5943fc764b7c49bab152c76a416785f1413cfbaf0d', + 'size_bytes': 2361572, + 'generation': 1736382920285247, + 'condition': 'host_os == "win" and checkout_clang_coverage_tools', + }, + { + 'object_name': 'Win/llvmobjdump-llvmorg-20-init-17108-g29ed6000-1.tar.xz', + 'sha256sum': '8884520329694e6f35ab9790f65a474e04bafc541d6d40592f43356f44ee0d40', + 'size_bytes': 5439908, + 'generation': 1736382920291826, + 'condition': 'checkout_linux or checkout_mac or checkout_android and host_os == "win"', + }, + ] + }, + # Update prebuilt Rust toolchain. + 'src/third_party/rust-toolchain': { + 'dep_type': 'gcs', + 'bucket': 'chromium-browser-clang', + 'objects': [ + { + 'object_name': 'Linux_x64/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', + 'sha256sum': '1363529d7285ca8623c6408d49419921d459bbc461fa26ae57f5b5a620a57cc2', + 'size_bytes': 124591376, + 'generation': 1736456746490086, + 'condition': 'host_os == "linux" and non_git_source', + }, + { + 'object_name': 'Mac/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', + 'sha256sum': 'bc2446c14bf6316ab2a5797b65daf229aecb65e1fa25184ec740137196ec111e', + 'size_bytes': 117535632, + 'generation': 1736456748324065, + 'condition': 'host_os == "mac" and host_cpu == "x64"', + }, + { + 'object_name': 'Mac_arm64/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', + 'sha256sum': '879947f21091c62096297c34c3e0a3f2e1f79260fb9b3c3c40091d62c65fb04e', + 'size_bytes': 102626588, + 'generation': 1736456750286270, + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + }, + { + 'object_name': 'Win/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', + 'sha256sum': '294a0a338bc46626b38d0d243f6f9a308dc2517cbf8961e2dc0edbf51b8d0ae9', + 'size_bytes': 176895424, + 'generation': 1736456752082017, + 'condition': 'host_os == "win"', + }, + ], + }, + 'src/hopium/tslib_hopium': { + 'url': Var('hopium_git') + '/tslib_hopium.git' + '@' + '686d3f51ebf70ba8097de852a90b0ef710dcea76', + 'condition': 'build_with_hopium', + }, + 'src/hopium/tsec_branding': { + 'url': Var('hopium_git') + '/tsec_branding.git' + '@' + '187d01930b937ea91248da84ba73276a86bc4cc1', + 'condition': 'build_with_hopium', + }, + 'src/third_party/poco/src': { + 'url': 'https://github.com/pocoproject/poco.git@poco-1.12.4-release', + 'condition': 'build_with_hopium', + }, + 'src/third_party/openssl/src': { + 'url': 'https://github.com/openssl/openssl.git@openssl-3.1.1', + 'condition': 'build_with_hopium', + }, 'src/third_party/clang-format/script': Var('chromium_git') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' + @@ -559,7 +1008,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_os == "linux"', + 'condition': 'host_os == "linux" and non_git_source', }, 'src/buildtools/mac': { 'packages': [ @@ -588,6 +1037,7 @@ deps = { 'version': Var('reclient_version'), } ], + 'condition': 'non_git_source', 'dep_type': 'cipd', }, @@ -602,7 +1052,7 @@ deps = { }, ], 'dep_type': 'cipd', - 'condition': '(host_os == "mac")', + 'condition': 'checkout_mac or checkout_ios', }, 'src/third_party/apache-mac-arm64': { 'packages': [ @@ -612,7 +1062,7 @@ deps = { }, ], 'dep_type': 'cipd', - 'condition': '(host_os == "mac")', + 'condition': 'checkout_mac or checkout_ios', }, 'src/third_party/apache-linux': { @@ -623,28 +1073,28 @@ deps = { }, ], 'dep_type': 'cipd', - 'condition': '(host_os == "linux")', + 'condition': '(host_os == "linux") and non_git_source', }, 'src/third_party/apache-windows-arm64': { 'packages': [ { 'package': 'infra/3pp/tools/httpd-php/windows-arm64', - 'version': 'version:2@httpd2.4.55-php8.2.5.chromium.6.chromium.5', + 'version': 'version:3@httpd2.4.55-php8.2.5.chromium.6', } ], 'dep_type': 'cipd', - 'condition': '(host_os == "win")' + 'condition': 'checkout_win' }, - 'src/third_party/aosp_dalvik': { + 'src/third_party/aosp_dalvik/cipd': { 'packages': [ { 'package': 'chromium/third_party/aosp_dalvik/linux-amd64', 'version': 'version:2@13.0.0_r24.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -652,34 +1102,39 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/cronet_android_mainline_clang/linux-amd64', - 'version': 'cOWHyVbQYOA9ATyuUaYmOE6YLer1h1JFFa6KRS3_hjIC', + 'version': 'V0dPF9Cc6TYEaE6vsPyJoFO6xD2_NglmR7Gbqrp7d-sC', }, ], 'condition': 'checkout_android and host_os == "linux"', 'dep_type': 'cipd', }, - 'src/android_webview/tools/cts_archive': { + 'src/android_webview/tools/cts_archive/cipd': { 'packages': [ { 'package': 'chromium/android_webview/tools/cts_archive', - 'version': 'D9ziv4Z61qHwterMTFEoPeCZzFNyUfMnWAlYuxEKlM8C', + 'version': 'UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/chrome/browser/resources/preinstalled_web_apps/internal': { - 'url': Var('chrome_git') + '/chrome/components/default_apps.git' + '@' + '3610b316398d68e3ae89388c03cb8bd8eb30e76a', + 'url': Var('chrome_git') + '/chrome/components/default_apps.git' + '@' + 'ef722130bdfed458eb5380f10585b880ae5dff4e', 'condition': 'checkout_src_internal', }, 'src/chrome/installer/mac/third_party/xz/xz': { - 'url': Var('chromium_git') + '/chromium/deps/xz.git' + '@' + 'eecaf55632ca72e90eb2641376bce7cdbc7284f7', + 'url': Var('chromium_git') + '/chromium/deps/xz.git' + '@' + '10d236393a338a55830db628356f022a91978b61', 'condition': 'checkout_mac', }, + 'src/chrome/release_scripts': { + 'url': Var('chrome_git') + '/chrome/tools/release/scripts' + '@' + 'cc3ac97c66a56f4218fee70f28958eaf11ef5d66', + 'condition': 'checkout_chrome_release_scripts', + }, + 'src/third_party/libc++/src': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + @@ -692,166 +1147,334 @@ deps = { Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + Var('libunwind_revision'), + 'src/third_party/llvm-libc/src': + Var('chromium_git') + + '/external/github.com/llvm/llvm-project/libc.git' + '@' + + Var('llvm_libc_revision'), - 'src/third_party/updater/chrome_linux64': { + 'src/third_party/updater/chrome_linux64/cipd': { 'dep_type': 'cipd', - 'condition': 'checkout_linux', + 'condition': 'checkout_linux and non_git_source', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_linux64', - 'version': 'iSlHWT_rV1izyFEkrQSJUVMZ_Z_8yUezA1tZGxQGsyQC', + 'version': 'ytJ0UbU9gMLUMLRQlmqQpGpOy1dYswI3rOJ0ILnIFbUC', }, ], }, - 'src/third_party/updater/chrome_mac_universal': { + 'src/third_party/updater/chrome_mac_universal/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_mac_universal', - 'version': 'wqWHMpsZxCa2LfUjZrdZkjgOQ80CkkHwst9JdQFFkAkC', + 'version': 'gzutuY-G7u8n5746jgmishm8uWjUR070TXdFc23Ea7YC', }, ], }, - 'src/third_party/updater/chrome_mac_universal_prod': { + 'src/third_party/updater/chrome_mac_universal_prod/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_mac_universal_prod', - 'version': 'M_TrB6I8-_jAoxW0cj0EnHM5pEwvgZO18jFILu8R4LcC', + # 129.0.6651.0 + 'version': 'IrAigaqukp1GbaksroZcR3Jo0oOYKg9kzatjzNNbXKQC', + }, + ], + }, + + # version:2@132.0.6833.0 + 'src/third_party/updater/chrome_win_arm64/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chrome_win_arm64', + 'version': 'OoGMyCUHah7D_AOVm4RpVoPOdkGqjFHuSMcoKTZ0rlsC', }, ], }, - 'src/third_party/updater/chrome_win_x86': { + # version:2@132.0.6833.0 + 'src/third_party/updater/chrome_win_x86/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_win_x86', - 'version': 'zvfjrCzT9GNDVHymDY88NGn2IrVKA_tYd-V_QmTqt28C', + 'version': 'gqhcrVQFtXAKUu7yEISTlbrBpPaBUnQZ6FdOo5E4HLQC', }, ], }, - 'src/third_party/updater/chrome_win_x86_64': { + # version:2@132.0.6833.0 + 'src/third_party/updater/chrome_win_x86_64/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_win_x86_64', - 'version': '4FUbb3_htxuPk87RNmno-bfZaJWidzjHyt5NZFkf8boC', + 'version': 'koo1i4cAVdOK2-re2VGbx-crCcbTz9h0qumUk1hyEt0C', }, ], }, - 'src/third_party/updater/chromium_linux64': { + # Branded builds for testing previous interface without `install_id` support. + 'src/third_party/updater/chrome_linux64_sans_iid/cipd': { 'dep_type': 'cipd', - 'condition': 'checkout_linux', + 'condition': 'checkout_linux and non_git_source', 'packages': [ { - 'package': 'chromium/third_party/updater/chromium_linux64', - 'version': '_-1WRZ9erGXLnlB11zitYjO6gARR5x7_IzwYxKkZHh8C', + 'package': 'chromium/third_party/updater/chrome_linux64', + 'version': 'ytJ0UbU9gMLUMLRQlmqQpGpOy1dYswI3rOJ0ILnIFbUC', }, ], }, - # A somewhat recent Chromium-branded updater build. (x86_64) - 'src/third_party/updater/chromium_mac_amd64': { + 'src/third_party/updater/chrome_mac_universal_sans_iid/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { - 'package': 'chromium/third_party/updater/chromium_mac_amd64', - 'version': 'ZsZx8bFql21zupbHw4O5qS6QZr02Nc8kTsp_2e2IjToC', + 'package': 'chromium/third_party/updater/chrome_mac_universal', + 'version': 'gzutuY-G7u8n5746jgmishm8uWjUR070TXdFc23Ea7YC', }, ], }, - # A somewhat recent Chromium-branded updater build. (ARM64) - 'src/third_party/updater/chromium_mac_arm64': { + 'src/third_party/updater/chrome_mac_universal_prod_sans_iid/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { - 'package': 'chromium/third_party/updater/chromium_mac_arm64', - 'version': '79GoWALQHkg2rvF55fdXXNks2q0Dc75_qGhHIbik7MoC', + 'package': 'chromium/third_party/updater/chrome_mac_universal_prod', + # 129.0.6651.0 + 'version': 'IrAigaqukp1GbaksroZcR3Jo0oOYKg9kzatjzNNbXKQC', }, ], }, - 'src/third_party/updater/chromium_win_x86': { + 'src/third_party/updater/chrome_win_arm64_sans_iid/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { - 'package': 'chromium/third_party/updater/chromium_win_x86', - 'version': 'eUElHsZXgwIguZXRg9XYE6JnGDbIPb6JkE0eweQTcrEC', + 'package': 'chromium/third_party/updater/chrome_win_arm64', + 'version': 'OoGMyCUHah7D_AOVm4RpVoPOdkGqjFHuSMcoKTZ0rlsC', }, ], }, - 'src/third_party/updater/chromium_win_x86_64': { + 'src/third_party/updater/chrome_win_x86_sans_iid/cipd': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { - 'package': 'chromium/third_party/updater/chromium_win_x86_64', - 'version': 'mQMfJlYl97M50ArghATBzIkNr-NajsEvVnJHQE_gsOQC', + 'package': 'chromium/third_party/updater/chrome_win_x86', + 'version': 'gqhcrVQFtXAKUu7yEISTlbrBpPaBUnQZ6FdOo5E4HLQC', }, ], }, - 'src/chrome/test/data/autofill/captured_sites/artifacts': { - 'url': Var('chrome_git') + '/chrome/test/captured_sites/autofill.git' + '@' + '654ecc6e5f3948e6c2dd42df13d2345f4f88bac3', - 'condition': 'checkout_chromium_autofill_test_dependencies', + 'src/third_party/updater/chrome_win_x86_64_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chrome_win_x86_64', + 'version': 'koo1i4cAVdOK2-re2VGbx-crCcbTz9h0qumUk1hyEt0C', + }, + ], }, - 'src/chrome/test/data/password/captured_sites/artifacts': { - 'url': Var('chrome_git') + '/chrome/test/captured_sites/password.git' + '@' + '04b3ea663adf745c52831650e2426b54bc94e65d', - 'condition': 'checkout_chromium_password_manager_test_dependencies', + 'src/third_party/updater/chromium_linux64/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_linux and non_git_source', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_linux64', + 'version': 'OLbfeePAbqPnFqcPmkFtR-GK8dN3T3NeH2AChZwBHjgC', + }, + ], }, - 'src/chrome/test/data/perf/canvas_bench': - Var('chromium_git') + '/chromium/canvas_bench.git' + '@' + 'a7b40ea5ae0239517d78845a5fc9b12976bfc732', - - 'src/chrome/test/data/perf/frame_rate/content': - Var('chromium_git') + '/chromium/frame_rate/content.git' + '@' + 'c10272c88463efeef6bb19c9ec07c42bc8fe22b9', + # A somewhat recent Chromium-branded updater build. (x86_64) + 'src/third_party/updater/chromium_mac_amd64/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_mac', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_mac_amd64', + 'version': 'zVv93X5XSClxTR1YejkQuBdSpye7JfPS_h6GcH1N4i4C', + }, + ], + }, - 'src/chrome/test/data/safe_browsing/dmg': { - 'packages': [ - { - 'package': 'chromium/chrome/test/data/safe_browsing/dmg', - 'version': '03TLfNQgc59nHmyWtYWJfFaUrEW8QDJJzXwm-672m-QC', - }, - ], - 'condition': 'checkout_mac', - 'dep_type': 'cipd', + # A somewhat recent Chromium-branded updater build. (ARM64) + 'src/third_party/updater/chromium_mac_arm64/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_mac', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_mac_arm64', + 'version': 'Va20qxSst3lq4WfEZlWiwzXCpSo5XbhhuqJXyqzvhF8C', + }, + ], }, - 'src/chrome/test/data/xr/webvr_info': + # r1372006 + 'src/third_party/updater/chromium_win_arm64/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_win_arm64', + 'version': 'ksRzLnqewvz7P-YMX2e8mxZuDI1hgPtLNCuAXIisXhoC', + }, + ], + }, + + # r1372046 + 'src/third_party/updater/chromium_win_x86/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_win_x86', + 'version': 'tcFWGGE3wmwKDhT_s-9mzPiQVYxMOI1U9sRAhm1_5QcC', + }, + ], + }, + + # r1372030 + 'src/third_party/updater/chromium_win_x86_64/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_win_x86_64', + 'version': 'iXamEEmbStVBV_c-vEG4Xtrda8tTqSRCZ-tmE7VRHb0C', + }, + ], + }, + + # Chromium builds for testing previous interface without `install_id` support. + 'src/third_party/updater/chromium_linux64_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_linux and non_git_source', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_linux64', + 'version': 'OLbfeePAbqPnFqcPmkFtR-GK8dN3T3NeH2AChZwBHjgC', + }, + ], + }, + + 'src/third_party/updater/chromium_mac_amd64_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_mac', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_mac_amd64', + 'version': 'zVv93X5XSClxTR1YejkQuBdSpye7JfPS_h6GcH1N4i4C', + }, + ], + }, + + 'src/third_party/updater/chromium_mac_arm64_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_mac', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_mac_arm64', + 'version': 'Va20qxSst3lq4WfEZlWiwzXCpSo5XbhhuqJXyqzvhF8C', + }, + ], + }, + + 'src/third_party/updater/chromium_win_arm64_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_win_arm64', + 'version': 'ksRzLnqewvz7P-YMX2e8mxZuDI1hgPtLNCuAXIisXhoC', + }, + ], + }, + + 'src/third_party/updater/chromium_win_x86_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_win_x86', + 'version': 'tcFWGGE3wmwKDhT_s-9mzPiQVYxMOI1U9sRAhm1_5QcC', + }, + ], + }, + + 'src/third_party/updater/chromium_win_x86_64_sans_iid/cipd': { + 'dep_type': 'cipd', + 'condition': 'checkout_win', + 'packages': [ + { + 'package': 'chromium/third_party/updater/chromium_win_x86_64', + 'version': 'iXamEEmbStVBV_c-vEG4Xtrda8tTqSRCZ-tmE7VRHb0C', + }, + ], + }, + + 'src/chrome/test/data/autofill/captured_sites/artifacts': { + 'url': Var('chrome_git') + '/chrome/test/captured_sites/autofill.git' + '@' + '8c66a34eccf070d66903db5db487bc1de597e7c6', + 'condition': 'checkout_chromium_autofill_test_dependencies', + }, + + 'src/chrome/test/data/password/captured_sites/artifacts': { + 'url': Var('chrome_git') + '/chrome/test/captured_sites/password.git' + '@' + '61b62cfe23abcdb7e86e3aa6b0690bd457d04604', + 'condition': 'checkout_chromium_password_manager_test_dependencies', + }, + + 'src/chrome/test/data/perf/canvas_bench': + Var('chromium_git') + '/chromium/canvas_bench.git' + '@' + 'a7b40ea5ae0239517d78845a5fc9b12976bfc732', + + 'src/chrome/test/data/perf/frame_rate/content': + Var('chromium_git') + '/chromium/frame_rate/content.git' + '@' + 'c10272c88463efeef6bb19c9ec07c42bc8fe22b9', + + 'src/chrome/test/data/safe_browsing/dmg': { + 'packages': [ + { + 'package': 'chromium/chrome/test/data/safe_browsing/dmg', + 'version': '03TLfNQgc59nHmyWtYWJfFaUrEW8QDJJzXwm-672m-QC', + }, + ], + 'condition': 'checkout_mac', + 'dep_type': 'cipd', + }, + + 'src/chrome/test/data/xr/webvr_info': Var('chromium_git') + '/external/github.com/toji/webvr.info.git' + '@' + 'c58ae99b9ff9e2aa4c524633519570bf33536248', 'src/clank': { 'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' + - '36b175764dc5eff90f46b004457effdf26664d0b', + 'eefbf9fd0ad615aa04bd7ea85c17048ed076f936', 'condition': 'checkout_android and checkout_src_internal', }, 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '49c12aba2275832dc5d645c12defc3e41f076392', + 'url': Var('chromium_git') + '/website.git' + '@' + 'd449eb6e9d475df9e5a54125e6582baba549280e', }, 'src/ios/third_party/earl_grey2/src': { - 'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + '37e7433033659e9f49202a7d94381796b5e83f47', + 'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + '43b9544b8f6691363b578bdefa32b884c5200cd9', 'condition': 'checkout_ios', }, 'src/ios/third_party/edo/src': { - 'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git' + '@' + '726d5e6fc7c316bfeea43716e5caa0adea4ecdae', + 'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git' + '@' + '8c825efc8ba6ca9147a148445449470a66b9dc54', 'condition': 'checkout_ios', }, @@ -866,7 +1489,7 @@ deps = { }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '17a0a793219751121f03e795bbd467d465b76788', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'b5bbb66b58798106ab6d1cab32a22288d3ccabd4', 'condition': 'checkout_ios', }, @@ -922,7 +1545,7 @@ deps = { }, 'src/media/cdm/api': - Var('chromium_git') + '/chromium/cdm.git' + '@' + 'fef0b5aa1bd31efb88dfab804bdbe614f3d54f28', + Var('chromium_git') + '/chromium/cdm.git' + '@' + '06395a2863cb1ebdb47617a995b73f95c14fe120', 'src/native_client': { 'url': Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'), @@ -932,52 +1555,27 @@ deps = { 'src/net/third_party/quiche/src': Var('quiche_git') + '/quiche.git' + '@' + Var('quiche_revision'), - 'src/testing/rts/linux-amd64': { - 'packages': [ - { - 'package': 'chromium/rts/model/linux-amd64', - 'version': '-MNzMfbaq88xANs_FwsnP3W56cD6R38bM3rV4PKoy7gC', - }, - ], - 'dep_type': 'cipd', - 'condition': 'checkout_rts_model and checkout_linux', - }, - - 'src/testing/rts/mac-amd64': { - 'packages': [ - { - 'package': 'chromium/rts/model/mac-amd64', - 'version': 'JZuaq-qPwX9_ihJIiHR5Js5D6yxFPn-lqJhk-BX6BWEC', - }, - ], - 'dep_type': 'cipd', - 'condition': 'checkout_rts_model and checkout_mac', - }, + 'src/testing/libfuzzer/fuzzers/wasm_corpus': + Var('chromium_git') + '/v8/fuzzer_wasm_corpus.git' + '@' + '1df5e50a45db9518a56ebb42cb020a94a090258b', - 'src/testing/rts/windows-amd64': { - 'packages': [ - { - 'package': 'chromium/rts/model/windows-amd64', - 'version': 'IKBcF0i7FUmPPRq6B2HRp5duZkH7Mqr4P8mLZOz-bcsC', - }, + 'src/tools/copybara': { + 'packages' : [ + { + 'package': 'infra/3pp/tools/copybara', + 'version': '_rad--EmYH2N8Qy7KNGyo4OnjbEVF67u2mqff_Q6lg8C', + }, ], + 'condition': 'host_os == "linux" and checkout_copybara', 'dep_type': 'cipd', - 'condition': 'checkout_rts_model and checkout_win', }, - 'src/testing/rts/rts-ml-chromium/linux-amd64': { + 'src/tools/luci-go': { 'packages': [ { - 'package': 'experimental/google.com/sshrimp/chromium/rts/model/linux-amd64', - 'version': '61RZ40XmEInOMhnIJMEqdOjocdCHqodmEJcDxu4x7uIC', + 'package': 'infra/tools/luci/cas/${{platform}}', + 'version': Var('luci_go'), }, - ], - 'dep_type': 'cipd', - 'condition': 'checkout_rts_experimental_model and checkout_linux', - }, - - 'src/tools/luci-go': { - 'packages': [ + # TODO(crbug.com/382506663): Remove after investigation/deprecation { 'package': 'infra/tools/luci/isolate/${{platform}}', 'version': Var('luci_go'), @@ -987,33 +1585,22 @@ deps = { 'version': Var('luci_go'), }, ], + 'condition': 'non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/accessibility_test_framework': { - 'packages': [ - { - 'package': 'chromium/third_party/accessibility-test-framework', - 'version': 'b5ec1e56e58e56bc1a0c77d43111c37f9b512c8a', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_protobuf/src': { - 'url': Var('android_git') + '/platform/external/protobuf.git' + '@' + '7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f', - 'condition': 'checkout_android', + 'src/third_party/accessibility_test_framework/src': { + 'url': Var('chromium_git') + '/external/github.com/google/Accessibility-Test-Framework-for-Android.git' + '@' + '4a764c690353ea136c82f1a696a70bf38d1ef5fe', }, - 'src/third_party/android_protoc': { + 'src/third_party/android_build_tools/protoc/cipd': { 'packages': [ { - 'package': 'chromium/third_party/android_protoc', - 'version': 'sLsJWojddBL2u8NYwNh6pJsqp_bL1ttmYIlBnhiIQ1QC', + 'package': 'chromium/third_party/android_build_tools/protoc', + 'version': 'ivH_8voaWaRDbk7bDHj8n5YR2IH7sFuenkqy0bVOb2cC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -1021,131 +1608,163 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_toolchain/android_toolchain', - 'version': 'R_8suM8m0oHbZ1awdxGXvKEFpAOETscbfZxkkMthyk8C', + 'version': 'Idl-vYnWGnM8K3XJhM3h6zjYVDXlnljVz3FE00V9IM8C', }, ], - 'condition': 'checkout_android_native_support', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/androidx': { + 'src/third_party/androidx/cipd': { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'DoS0WwXEMCOY-zSJ8hINm4vTrX1WPpwf43I2K2XtcM4C', + 'version': 'VWuP17o8bAsMqJ5b_3fu60qkAIWd905hpPI83flbNrMC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/androidx_javascriptengine/src': { - 'url': Var('chromium_git') + '/aosp/platform/frameworks/support/javascriptengine/javascriptengine/src.git' + '@' + '30ea6d647887c3bdfc47b04764b3444d0179f61b', + 'url': Var('chromium_git') + '/aosp/platform/frameworks/support/javascriptengine/javascriptengine/src.git' + '@' + 'e3b6fc680728040f97442dc29d978ce5df6e76f4', 'condition': 'checkout_android', }, - 'src/third_party/android_system_sdk': { + 'src/third_party/android_system_sdk/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_system_sdk/public', - 'version': '4QeolYaSKWBtVTgzJU4tHUfzA9OJTDM8YUcD426IctwC', + 'version': 'XzzECzCzGLrccJS1U-HdmM5VMh9BotgQ_mWhFQ464PwC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/aapt2': { + 'src/third_party/android_build_tools/aapt2/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/aapt2', - 'version': 'STY0BXlZxsEhudnlXQFed-B5UpwehcoM0sYqor6qRqsC', + 'version': '_lNsOL_GGlXLOIMGtrbMOqNd7TQHabaP1q8SlvUpFbMC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/apkanalyzer': { + 'src/third_party/android_build_tools/apkanalyzer/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/apkanalyzer', 'version': 'O8Lyta0y6jpvFD1rbPp7trvcM2rdny3ngyhyeYAWXK4C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/bundletool': { + 'src/third_party/android_build_tools/bundletool/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/bundletool', - 'version': '2RPwohwtc6on0_96oFxokeEvnC1LbLrGuyCAw00k62AC', + 'version': 'tal0sHGlqsDFNFQ5lV1zRomrRs0Ppq6ngUOYbACAAUwC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_build_tools/dagger_compiler/cipd': { + 'packages': [ + { + 'package': 'chromium/third_party/android_build_tools/dagger_compiler', + 'version': 'AC0DoTEXQf40KFt7hyCNSEJPrT9Rprw9zsZxNKdw7BQC', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_build_tools/error_prone/cipd': { + 'packages': [ + { + 'package': 'chromium/third_party/android_build_tools/error_prone', + 'version': '7c91BXn6VPvSmr-dFRYaNVkfHjRN1jdMIN4EcrPem9cC', + }, + ], + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/lint': { + 'src/third_party/android_build_tools/error_prone_javac/cipd': { + 'packages': [ + { + 'package': 'chromium/third_party/android_build_tools/error_prone_javac', + 'version': '7EcHxlEXEaLRWEyHIAxf0ouPjkmN1Od6jkutuo0sfBIC', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_build_tools/lint/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/lint', - 'version': 'qaZOeTY-k9wAZ1vkdqCZIbppqQFgc4IM5T5dKj3_2xIC', + 'version': '_77LT8DN3c2A3RPC4ctJk-kOk2K_QEuS3_aQty7g384C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/manifest_merger': { + 'src/third_party/android_build_tools/manifest_merger/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/manifest_merger', - 'version': 'Nc9kYyTsw69N7yKSw_Sc2fJtUJ2zXUhSGjXbIkDVXuIC', + 'version': 'osgd04hyZB3eu5L7oiL6irk9AqRBX9lOxNLsaCmUCowC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_build_tools/nullaway/cipd': { + 'packages': [ + { + 'package': 'chromium/third_party/android_build_tools/nullaway', + 'version': '65WJkoinJEXvtu9xwdDNDb3QCbqBAl8FKDpgnXr3iiEC', + }, + ], + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/android_sdk/public': { 'packages': [ { - 'package': 'chromium/third_party/android_sdk/public/build-tools/34.0.0', + 'package': 'chromium/third_party/android_sdk/public/build-tools/35.0.0', 'version': Var('android_sdk_build-tools_version'), }, { 'package': 'chromium/third_party/android_sdk/public/emulator', 'version': Var('android_sdk_emulator_version'), }, - { - 'package': 'chromium/third_party/android_sdk/public/patcher', - 'version': Var('android_sdk_patcher_version'), - }, { 'package': 'chromium/third_party/android_sdk/public/platform-tools', 'version': Var('android_sdk_platform-tools_version'), }, { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-34', + 'package': 'chromium/third_party/android_sdk/public/platforms/android-35', 'version': Var('android_sdk_platforms_version'), }, - { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-tiramisuprivacysandbox', - 'version': Var('android_sdk_platforms_preview_version'), - }, - { - 'package': 'chromium/third_party/android_sdk/public/sources/android-31', - 'version': Var('android_sdk_sources_version'), - }, { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', - 'version': 'Sy00LuyBIUJdRGYKwg0zjWH8eAIUvgnnNiPkI8etaZYC', + 'version': 'OCGHZKTdjXjIELVI6FMAgcDkfnd_1ybB0_MtljPtz-8C', }, ], - 'condition': 'checkout_android_native_support', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -1153,13 +1772,84 @@ deps = { Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'), 'src/third_party/anonymous_tokens/src': - Var('chromium_git') + '/external/github.com/google/anonymous-tokens.git' + '@' + '8c8d20953d502db31fec2353b199e6c22ef0236e', + Var('chromium_git') + '/external/github.com/google/anonymous-tokens.git' + '@' + '6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8', + + 'src/third_party/blink/renderer/core/css/perftest_data': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-style-perftest', + 'objects': [ + { + 'object_name': 'e9ce994346c62f8c9fd6d0cecb2b2b0b93b4c2d8', + 'sha256sum': '519019df16c628c6c0893df18928faeaa3150a9d8f26a787a16ce7c6b2cec2ad', + 'size_bytes': 601672, + 'generation': 1664794185950162, + 'output_file': 'ecommerce.json', + }, + { + 'object_name': '756068da5e551516b23b0ba133e55c144f623d38', + 'sha256sum': '84ef87a8163335a95111d9709306596f96742539da0b34fbe7397f799946a168', + 'size_bytes': 2156935, + 'generation': 1664794188995509, + 'output_file': 'encyclopedia.json', + }, + { + 'object_name': '314e4e0d5e89ea9e9e9a234c617b4413adf48aa9', + 'sha256sum': 'a721ada40011a286631baae6d76878f2023ff000151792228c83b1958ea8a197', + 'size_bytes': 608840, + 'generation': 1664794191929032, + 'output_file': 'extension.json', + }, + { + 'object_name': '3a19b42a7c46257b716d55d6733f070c87180b1e', + 'sha256sum': 'f203ff9e8c8a6a3b714f0a26db38cc940544a907435c62c79b21f4bd3f8bee8e', + 'size_bytes': 1750837, + 'generation': 1664794194891567, + 'output_file': 'news.json', + }, + { + 'object_name': 'fdc43ee18cbd65487249441849f58aa13484aaef', + 'sha256sum': '0e92de92f49abc9a521f7175106c80744196f8cefc0263bc0f4a6b4f724a7d10', + 'size_bytes': 1310798, + 'generation': 1664794197855470, + 'output_file': 'search.json', + }, + { + 'object_name': '7fc9338af75b7d9d185c91ddf262a356def5623d', + 'sha256sum': '34e92acae8aade2a186abe79ed1f379c266f04f72f1eb54bd3a912e889bc5cc0', + 'size_bytes': 2280846, + 'generation': 1664794200867034, + 'output_file': 'social1.json', + }, + { + 'object_name': 'c2d7e9ce67522dad138c7feb0a6911b828bfb130', + 'sha256sum': '95c6b148577b891310c024b2daa5d68faf644a37707ac0cb21501eefe8a399a3', + 'size_bytes': 411708, + 'generation': 1664794203829582, + 'output_file': 'social2.json', + }, + { + 'object_name': '031d5599c8a21118754e30dbea141be66104f556', + 'sha256sum': '8e7b765d72bb8e7742f5bf955f4bf64d5469f61197dad8b632304095a52322d7', + 'size_bytes': 3203922, + 'generation': 1664794206824773, + 'output_file': 'sports.json', + }, + { + 'object_name': '8aac3db2a8c9e44babec81e539a3d60aeab4985c', + 'sha256sum': '6aeb0036dfafaf5e905abdb0ffe515a3952ffe35a7c59afb0fc8b233b27c6ce4', + 'size_bytes': 5902660, + 'generation': 1664794209886788, + 'output_file': 'video.json', + }, + ], + }, 'src/third_party/content_analysis_sdk/src': - Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + '8d5118720805fdce0dd3ee2999c964501de4532c', + Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + '9a408736204513e0e95dd2ab3c08de0d95963efc', 'src/third_party/dav1d/libdav1d': - Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'f8ae94eca0f53502a2cddd29a263c1edea4822a0', + Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'edb16889d16f5e13161b6e8f7a839cd82d7d655d', 'src/third_party/dawn': Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'), @@ -1173,43 +1863,37 @@ deps = { }, 'src/third_party/barhopper': { - 'url': Var('chrome_git') + '/chrome/deps/barhopper.git' + '@' + '865bd06ef4a839b0a15d17e38e25f8911e4cdf9f', + 'url': Var('chrome_git') + '/chrome/deps/barhopper.git' + '@' + '9230af4dc38c6d2cc9c0841692267762ebfca991', 'condition': 'checkout_src_internal and checkout_chromeos', }, 'src/third_party/google_benchmark/src': - Var('chromium_git') + '/external/github.com/google/benchmark.git' + '@' + 'b177433f3ee2513b1075140c723d73ab8901790f', - - 'src/third_party/boringssl/src': - Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), - - 'src/third_party/breakpad/breakpad': - Var('chromium_git') + '/breakpad/breakpad.git' + '@' + '8988364bcddd9b194b0bf931c10bc125987330ed', + Var('chromium_git') + '/external/github.com/google/benchmark.git' + '@' + '761305ec3b33abf30e08d50eb829e19a802581cc', - 'src/third_party/byte_buddy': { - 'packages': [ + # Download test data for Maps telemetry_gpu_integration_test. + 'src/tools/perf/page_sets/maps_perf_test/dataset': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-telemetry', + 'objects': [ { - 'package': 'chromium/third_party/byte_buddy', - 'version': 'c9b53316603fc2d997c899c7ca1707f809b918cd', + 'object_name': 'e6bf26977c2fd80c18789d1f279d474096a7b0d1', + 'sha256sum': 'f5f7fe360ad2b9c3d9dda2612f17336c0541bac15b4e4992f2c167e059a190fa', + 'size_bytes': 3285237, + 'generation': 1513305740113238, + 'output_file': 'load_dataset', }, ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', }, - 'src/third_party/byte_buddy/android_sdk_build_tools_25_0_2': { - 'packages': [ - { - 'package': 'chromium/third_party/android_sdk/public/build-tools', - 'version': 'kwIs2vdfTm93yEP8LG5aSnchN4BVEdVxbqQtF4XpPdkC', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, + 'src/third_party/boringssl/src': + Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), + + 'src/third_party/breakpad/breakpad': + Var('chromium_git') + '/breakpad/breakpad.git' + '@' + '0dfd77492fdb0dcd06027c5842095e2e908adc90', 'src/third_party/cast_core/public/src': - Var('chromium_git') + '/cast_core/public' + '@' + '71f51fd6fa45fac73848f65421081edd723297cd', + Var('chromium_git') + '/cast_core/public' + '@' + 'fbc5e98031e1271a0a566fcd4d9092b2d3275d05', 'src/third_party/catapult': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), @@ -1217,7 +1901,7 @@ deps = { 'src/third_party/ced/src': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + 'ba412eaaacd3186085babcd901679a48863c7dd5', - 'src/third_party/checkstyle': { + 'src/third_party/checkstyle/cipd': { 'packages': [ { 'package': 'chromium/third_party/checkstyle', @@ -1225,7 +1909,7 @@ deps = { }, ], # Needed on Linux for use on chromium_presubmit. - 'condition': 'checkout_android or checkout_linux', + 'condition': '(checkout_android or checkout_linux) and non_git_source', 'dep_type': 'cipd', }, @@ -1241,7 +1925,7 @@ deps = { # Tools used when building Chrome for Chrome OS. This affects both the Simple # Chrome workflow, as well as the chromeos-chrome ebuild. 'src/third_party/chromite': { - 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'c4b0ff08d3975d0d7a8170c2014504d81d778288', + 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'ba62bfc818c2958c8feae178a18545ad5f7b0305', 'condition': 'checkout_chromeos', }, @@ -1255,42 +1939,32 @@ deps = { Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e', 'src/third_party/cpuinfo/src': - Var('chromium_git') + '/external/github.com/pytorch/cpuinfo.git' + '@' + 'c13d0bbb266d200a13532b5915d704c30d21081b', + Var('chromium_git') + '/external/github.com/pytorch/cpuinfo.git' + '@' + 'ca156f7bc9109c552973414a63d310f76ef0cbf8', 'src/third_party/crc32c/src': - Var('chromium_git') + '/external/github.com/google/crc32c.git' + '@' + 'fa5ade41ee480003d9c5af6f43567ba22e4e17e6', + Var('chromium_git') + '/external/github.com/google/crc32c.git' + '@' + 'd3d60ac6e0f16780bcfcc825385e1d338801a558', # For Linux and Chromium OS. 'src/third_party/cros_system_api': { - 'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + 'd8500b7e0282be2e500005ddfb06c8de646ef9ee', - 'condition': 'checkout_linux', + 'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '497b90c6e283745f976d783ed2beaafeef42b1bf', + 'condition': 'checkout_linux or checkout_chromeos', }, 'src/third_party/crossbench': Var('chromium_git') + '/crossbench.git' + '@' + Var('crossbench_revision'), - 'src/third_party/crubit/src': { - 'url': Var('chromium_git') + '/external/github.com/google/crubit.git' + '@' + Var('crubit_revision'), - 'condition': 'checkout_crubit', - }, - 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '3dce403ca3903542176cd6e37bcc2bd828424bb4', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '80d1969422e75e8e9eecafa46074074b289e2568', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), - 'src/third_party/devtools-frontend-internal': { - 'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '3ff6a880012bb45d8feff5e6d7de499729d6ff72', - 'condition': 'checkout_src_internal', - }, - 'src/third_party/dom_distiller_js/dist': Var('chromium_git') + '/chromium/dom-distiller/dist.git' + '@' + '199de96b345ada7c6e7e6ba3d2fa7a6911b8767d', 'src/third_party/eigen3/src': - Var('chromium_git') + '/external/gitlab.com/libeigen/eigen.git' + '@' + '66e8f38891841bf88ee976a316c0c78a52f0cee5', + Var('chromium_git') + '/external/gitlab.com/libeigen/eigen.git' + '@' + '7bb23b1e360e22a395eef75061565fc079ae6a85', 'src/third_party/emoji-metadata/src': { 'url': Var('chromium_git') + '/external/github.com/googlefonts/emoji-metadata' + '@' + '045f146fca682a836e01cd265171312bfb300e06', @@ -1304,13 +1978,16 @@ deps = { 'version': '5LoBT0j383h_4dXbnap7gnNQMtMjpbMJD1JaGIYNj-IC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/farmhash/src': Var('chromium_git') + '/external/github.com/google/farmhash.git' + '@' + '816a4ae622e964763ca0862d9dbd19324a1eaf45', + 'src/third_party/fast_float/src': + Var('chromium_git') + '/external/github.com/fastfloat/fast_float.git' + '@' + 'cb1d42aaa1e14b09e1452cfdef373d051b8c02a4', + 'src/third_party/ffmpeg': Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + Var('ffmpeg_revision'), @@ -1318,11 +1995,11 @@ deps = { Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '689da3a7ed50af7448c3f1961d1791c7c1d9c85c', 'src/third_party/flatbuffers/src': - Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '28861d1d7d5ec6ce34d4bbdc10bec4aace341167', + Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '8db59321d9f02cdffa30126654059c7d02f70c32', # Used for embedded builds. CrOS & Linux use the system version. 'src/third_party/fontconfig/src': { - 'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + '2fb3419a92156569bc1ec707401258c922cd0d99', + 'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + '14d466b30a8ab4a9d789977ed94f2c30e7209267', 'condition': 'checkout_linux', }, @@ -1333,7 +2010,7 @@ deps = { Var('chromium_git') + '/external/github.com/google/gemmlowp.git' + '@' + '13d57703abca3005d97b19df1f2db731607a7dc2', 'src/third_party/grpc/src': { - 'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + '822dab21d9995c5cf942476b35ca12a1aa9d2737', + 'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + 'a363b6c001139b9c8ffb7cd63f60a72f15349c3b', }, 'src/third_party/freetype/src': @@ -1348,6 +2025,22 @@ deps = { 'src/third_party/harfbuzz-ng/src': Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + Var('harfbuzz_revision'), + 'src/third_party/ink/src': + Var('chromium_git') + '/external/github.com/google/ink.git' + '@' + Var('ink_revision'), + + 'src/third_party/ink_stroke_modeler/src': + Var('chromium_git') + '/external/github.com/google/ink-stroke-modeler.git' + '@' + Var('ink_stroke_modeler_revision'), + + 'src/third_party/instrumented_libs': { + 'url': Var('chromium_git') + '/chromium/third_party/instrumented_libraries.git' + '@' + '3cc43119a29158bcde39d288a8def4b8ec49baf8', + 'condition': 'checkout_instrumented_libraries', + }, + + 'src/third_party/jszip/src': { + 'url': Var('chromium_git') + '/external/github.com/Stuk/jszip.git' + '@' + '2ceb998e29d4171b4f3f2ecab1a2195c696543c0', + 'condition': 'checkout_ios', + }, + 'src/third_party/emoji-segmenter/src': Var('chromium_git') + '/external/github.com/google/emoji-segmenter.git' + '@' + Var('emoji_segmenter_revision'), @@ -1355,62 +2048,45 @@ deps = { Var('chromium_git') + '/external/github.com/khaledhosny/ots.git' + '@' + Var('ots_revision'), 'src/third_party/libgav1/src': - Var('chromium_git') + '/codecs/libgav1.git' + '@' + 'df0023cc95b8e606a2fd243522d823401ef86637', + Var('chromium_git') + '/codecs/libgav1.git' + '@' + 'a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd', 'src/third_party/google_toolbox_for_mac/src': { 'url': Var('chromium_git') + '/external/github.com/google/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'), 'condition': 'checkout_ios or checkout_mac', }, - 'src/third_party/google-truth': { - 'packages': [ - { - 'package': 'chromium/third_party/google-truth', - 'version': 'u8oovXxp24lStqX4d54htRovta-75Sy2w7ijg1TL07gC', - }, - ], + 'src/third_party/google-truth/src': { + 'url': Var('chromium_git') + '/external/github.com/google/truth.git' + '@' + '33387149b465f82712a817e6744847fe136949b3', 'condition': 'checkout_android', - 'dep_type': 'cipd', }, 'src/third_party/googletest/src': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + Var('googletest_revision'), - # GNU binutils assembler for x86-32. - 'src/third_party/gnu_binutils': { - 'url': Var('chromium_git') + '/native_client/deps/third_party/gnu_binutils.git' + '@' + 'f4003433b61b25666565690caf3d7a7a1a4ec436', - 'condition': 'checkout_nacl and checkout_win', - }, - 'src/third_party/gperf': { 'url': Var('chromium_git') + '/chromium/deps/gperf.git' + '@' + 'd892d79f64f9449770443fb06da49b5a1e5d33c1', 'condition': 'checkout_win', }, - 'src/third_party/gvr-android-sdk/src': { - 'url': Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + '233e7fe922a543e0bc55382d64cacd047307d0e7', - 'condition': 'checkout_android', - }, - 'src/third_party/cardboard/src' : { - 'url': Var('chromium_git') + '/external/github.com/googlevr/cardboard/' + '@' + '80170209084b10860c76ea95a008875ff2a46bd4', + 'url': Var('chromium_git') + '/external/github.com/googlevr/cardboard/' + '@' + '596352df971aacede278a50f55ff1fecc4e81afc', 'condition': 'checkout_android', }, 'src/third_party/arcore-android-sdk/src': { - 'url': Var('chromium_git') + '/external/github.com/google-ar/arcore-android-sdk.git' + '@' + 'd197af6b38f98d2344bc7f76326c4aa0c4f2fb90', + 'url': Var('chromium_git') + '/external/github.com/google-ar/arcore-android-sdk.git' + '@' + '80036a515b38deca1ad080b7c436856b454358f5', 'condition': 'checkout_android', }, - 'src/third_party/arcore-android-sdk-client': { + 'src/third_party/arcore-android-sdk-client/cipd': { 'packages': [ { 'package': 'chromium/third_party/arcore-android-sdk-client', - 'version': 'NYf1qvBS9hNVK-6exAl-MaVbQsRKCDYl5Br936GtcU0C', + 'version': 'gHDxvBRNpM868XTWU9SdfMqtVYTFSvK2tLRAKq4V37wC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -1427,42 +2103,54 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/hamcrest': { + 'src/third_party/google-java-format/cipd': { 'packages': [ { - 'package': 'chromium/third_party/hamcrest', - 'version': '37eccfc658fe79695d6abb6dd497463c4372032f', + 'package': 'chromium/third_party/google-java-format', + 'version': 'AQn4F5NfPAs_GKX-z3OW_Q7-yJ9N6tPrDnmnDScjkTEC', }, ], - 'condition': 'checkout_android', + # Needed on Linux for use on chromium_presubmit. + 'condition': '(checkout_android or checkout_linux) and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/hunspell_dictionaries': - Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e', - + 'src/third_party/hamcrest/cipd': { + 'packages': [ + { + 'package': 'chromium/third_party/hamcrest', + 'version': 'dBioOAmFJjqAr_DY7dipbXdVfAxUQwjOBNibMPtX8lQC', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/hunspell_dictionaries': + Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e', + 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'de4ce0071eb47ed54cbda54869001210cf3a8ae5', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'bbccc2f6efc1b825de5f2c903c48be685cd0cf22', - 'src/third_party/icu4j': { + 'src/third_party/icu4j/cipd': { 'packages': [ { 'package': 'chromium/third_party/icu4j', - 'version': 'e87e5bed2b4935913ee26a3ebd0b723ee2344354', + 'version': '8dV7WRVX0tTaNNqkLEnCA_dMofr2MJXFK400E7gOFygC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/jacoco': { + 'src/third_party/jacoco/cipd': { 'packages': [ { 'package': 'chromium/third_party/jacoco', 'version': 'DWx1sUw2_F3SN9e21bI3W5vGT08eR3HQpXLZy6f-AnwC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -1471,15 +2159,15 @@ deps = { 'condition': 'checkout_android', }, - 'src/third_party/jdk': { + 'src/third_party/jdk/current': { 'packages': [ { 'package': 'chromium/third_party/jdk', - 'version': 'GCFtf5t6M4HlrHj6NXedHbpHp2xjgognF8ptNci4478C', + 'version': 'G-WIGWdFIBTPPhv2xPK_lTfI5N7WmfCBh0oTKqX-c5sC', }, ], # Needed on Linux for use on chromium_presubmit (for checkstyle). - 'condition': 'checkout_android or checkout_linux', + 'condition': '(checkout_android or checkout_linux) and non_git_source', 'dep_type': 'cipd', }, @@ -1501,18 +2189,18 @@ deps = { + '@' + '42e892d96e47b1f6e29844cc705e148ec4856448', # release 1.9.4 'src/third_party/junit/src': { - 'url': Var('chromium_git') + '/external/junit.git' + '@' + '05fe2a64f59127c02135be22f416e91260d6ede6', + 'url': Var('chromium_git') + '/external/junit.git' + '@' + '0eb5ce72848d730da5bd6d42902fdd6a8a42055d', 'condition': 'checkout_android', }, - 'src/third_party/kotlin_stdlib': { + 'src/third_party/kotlin_stdlib/cipd': { 'packages': [ { 'package': 'chromium/third_party/kotlin_stdlib', - 'version': '6cGkpHi3fSRhpRfq2b1mjmzfFmShvtQe6gy4g2nFQd0C', + 'version': 'rR6d6Pj-PTodfgswJ661KwgKAuHXYKAhifnuXpoo748C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -1520,15 +2208,15 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/kotlinc', - 'version': 'Rr02Gf2EkaeSs3EhSUHhPqDHSd1AzimrM6cRYUJCPjQC', + 'version': 'VgYl1YO2AM2qu-RYvdko61h4YtNnJeZlGWWppX7vJq8C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/leveldatabase/src': - Var('chromium_git') + '/external/leveldb.git' + '@' + '068d5ee1a3ac40dabd00d211d5013af44be55bea', + Var('chromium_git') + '/external/leveldb.git' + '@' + '578eeb702ec0fbb6b9780f3d4147b1076630d633', 'src/third_party/libFuzzer/src': Var('chromium_git') + '/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + Var('libfuzzer_revision'), @@ -1536,17 +2224,20 @@ deps = { 'src/third_party/fuzztest/src': Var('chromium_git') + '/external/github.com/google/fuzztest.git' + '@' + Var('fuzztest_revision'), + 'src/third_party/domato/src': + Var('chromium_git') + '/external/github.com/googleprojectzero/domato.git' + '@' + Var('domato_revision'), + 'src/third_party/libaddressinput/src': - Var('chromium_git') + '/external/libaddressinput.git' + '@' + 'e8712e415627f22d0b00ebee8db99547077f39bd', + Var('chromium_git') + '/external/libaddressinput.git' + '@' + '2610f7b1043d6784ada41392fc9392d1ea09ea07', 'src/third_party/libaom/source/libaom': - Var('aomedia_git') + '/aom.git' + '@' + '00ef4ff15e3e62c50e381eb00c08d7f709226d40', + Var('aomedia_git') + '/aom.git' + '@' + 'd737ca3ebe92feec465876a8fc98950cecd08fd8', 'src/third_party/libavif/src': Var('chromium_git') + '/external/github.com/AOMediaCodec/libavif.git' + '@' + Var('libavif_revision'), - 'src/third_party/libavifinfo/src': - Var('aomedia_git') + '/libavifinfo.git' + '@' + Var('libavifinfo_revision'), + 'src/third_party/crabbyavif/src': + Var('chromium_git') + '/external/github.com/webmproject/CrabbyAvif.git' + '@' + Var('crabbyavif_revision'), 'src/third_party/nearby/src': Var('chromium_git') + '/external/github.com/google/nearby-connections.git' + '@' + Var('nearby_revision'), @@ -1557,6 +2248,18 @@ deps = { 'src/third_party/securemessage/src': Var('chromium_git') + '/external/github.com/google/securemessage.git' + '@' + Var('securemessage_revision'), + 'src/third_party/speedometer/main': + Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_main_revision'), + + 'src/third_party/speedometer/v3.0': + Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_3.0_revision'), + + 'src/third_party/speedometer/v2.0': + Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_2.0_revision'), + + 'src/third_party/speedometer/v2.1': + Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_2.1_revision'), + 'src/third_party/ukey2/src': Var('chromium_git') + '/external/github.com/google/ukey2.git' + '@' + Var('ukey2_revision'), @@ -1565,7 +2268,7 @@ deps = { # Userspace interface to kernel DRM services. 'src/third_party/libdrm/src': { - 'url': Var('chromium_git') + '/chromiumos/third_party/libdrm.git' + '@' + '98e1db501173303e58ef6a1def94ab7a2d84afc1', + 'url': Var('chromium_git') + '/chromiumos/third_party/libdrm.git' + '@' + 'ad78bb591d02162d3b90890aa4d0a238b2a37cde', 'condition': 'checkout_linux', }, @@ -1579,7 +2282,7 @@ deps = { }, 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '30bdb85e302ecfc52593636b2f44af438e05e784', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '927aabfcd26897abb9776ecf2a6c38ea5bb52ab6', 'src/third_party/liblouis/src': { 'url': Var('chromium_git') + '/external/liblouis-github.git' + '@' + '9700847afb92cb35969bdfcbbfbbb74b9c7b3376', @@ -1587,36 +2290,39 @@ deps = { }, 'src/third_party/libphonenumber/dist': - Var('chromium_git') + '/external/libphonenumber.git' + '@' + '140dfeb81b753388e8a672900fb7a971e9a0d362', + Var('chromium_git') + '/external/libphonenumber.git' + '@' + '9d46308f313f2bf8dbce1dfd4f364633ca869ca7', 'src/third_party/libprotobuf-mutator/src': Var('chromium_git') + '/external/github.com/google/libprotobuf-mutator.git' + '@' + Var('libprotobuf-mutator'), 'src/third_party/libsrtp': - Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '5b7c744eb8310250ccc534f3f86a2015b3887a0a', + Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'a52756acb1c5e133089c798736dd171567df11f5', # Android Explicit Synchronization. 'src/third_party/libsync/src': { 'url': Var('chromium_git') + '/aosp/platform/system/core/libsync.git' + '@' + 'f4f4387b6bf2387efbcfd1453af4892e8982faf6', - 'condition': 'checkout_linux', + 'condition': 'checkout_linux or checkout_android', }, 'src/third_party/libunwindstack': { - 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '4dbfa0e8c844c8e243b297bc185e54a99ff94f9e', + 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + 'e5061bbda4c2ba6438020669ed06b122032433dd', 'condition': 'checkout_android', }, + 'src/third_party/libva-fake-driver/src': + Var('chromium_git') + '/chromiumos/platform/libva-fake-driver.git' + '@' + 'a9bcab9cd6b15d4e3634ca44d5e5f7652c612194', + 'src/third_party/libvpx/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + '24c0dcc8513b8c1ba4ffbf934a399f89de646ffe', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '7a65480684b1b28bb9defae164bf0dc78b32653e', 'src/third_party/libwebm/source': - Var('chromium_git') + '/webm/libwebm.git' + '@' + 'e4fbea0c9751ae8aa86629b197a28d8276a2b0da', + Var('chromium_git') + '/webm/libwebm.git' + '@' + '26d9f667170dc75e8d759a997bb61c64dec42dda', 'src/third_party/libwebp/src': - Var('chromium_git') + '/webm/libwebp.git' + '@' + 'fd7bb21c0cb56e8a82e9bfa376164b842f433f3b', + Var('chromium_git') + '/webm/libwebp.git' + '@' + '2af6c034ac871c967e04c8c9f8bf2dbc2e271b18', 'src/third_party/libyuv': - Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '04821d1e7d60845525e8db55c7bcd41ef5be9406', + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '10592b60c0b2c33210b7752454253dc2625b4305', 'src/third_party/lighttpd': { 'url': Var('chromium_git') + '/chromium/deps/lighttpd.git' + '@' + Var('lighttpd_revision'), @@ -1632,7 +2338,7 @@ deps = { 'packages': [ { 'package': 'infra/3pp/tools/7z/${{platform}}', - 'version': 'version:2@22.01', + 'version': 'version:3@24.09', }, ], 'condition': 'checkout_win', @@ -1643,7 +2349,7 @@ deps = { 'packages': [ { 'package': 'infra/3pp/tools/7z/windows-amd64', - 'version': 'version:2@22.01', + 'version': 'version:3@24.09', }, ], 'condition': 'checkout_win', @@ -1651,7 +2357,7 @@ deps = { }, 'src/third_party/material_color_utilities/src': { - 'url': Var('chromium_git') + '/external/github.com/material-foundation/material-color-utilities.git' + '@' + '234a000e507d586c20df6e3bf5b9e035bc5ce7b1', + 'url': Var('chromium_git') + '/external/github.com/material-foundation/material-color-utilities.git' + '@' + '13434b50dcb64a482cc91191f8cf6151d90f5465', }, 'src/third_party/material_design_icons/src': { @@ -1660,6 +2366,11 @@ deps = { 'condition': 'checkout_ios', }, + 'src/third_party/microsoft_dxheaders/src': { + 'url': Var('chromium_git') + '/external/github.com/microsoft/DirectX-Headers.git' + '@' + 'd9020edfc69b789653e04fa2d8d10ee3317ffa56', + 'condition': 'checkout_win', + }, + 'src/third_party/mig/bin': { 'packages': [ { @@ -1671,31 +2382,19 @@ deps = { 'dep_type': 'cipd', }, - # GNU binutils assembler for x86-64. - 'src/third_party/mingw-w64/mingw/bin': { - 'url': Var('chromium_git') + '/native_client/deps/third_party/mingw-w64/mingw/bin.git' + '@' + '3cc8b140b883a9fe4986d12cfd46c16a093d3527', - 'condition': 'checkout_nacl and checkout_win', - }, - # Graphics buffer allocator for Chrome OS. 'src/third_party/minigbm/src': { 'url': Var('chromium_git') + '/chromiumos/platform/minigbm.git' + '@' + '3018207f4d89395cc271278fb9a6558b660885f5', 'condition': 'checkout_linux', }, - # Binaries for nacl sdk. - 'src/third_party/nacl_sdk_binaries': { - 'url': Var('chromium_git') + '/chromium/deps/nacl_sdk_binaries.git' + '@' + '759dfca03bdc774da7ecbf974f6e2b84f43699a5', - 'condition': 'checkout_nacl and checkout_win', - }, - 'src/third_party/nasm': { 'url': Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + - '7fc833e889d1afda72c06220e5bed8fb43b2e5ce' + 'f477acb1049f5e043904b87b825c5915084a9a29' }, 'src/third_party/neon_2_sse/src': - Var('chromium_git') + '/external/github.com/intel/ARM_NEON_2_x86_SSE.git' + '@' + 'a15b489e1222b2087007546b4912e21293ea86ff', + Var('chromium_git') + '/external/github.com/intel/ARM_NEON_2_x86_SSE.git' + '@' + 'eb8b80b28f956275e291ea04a7beb5ed8289e872', 'src/third_party/netty-tcnative/src': { 'url': Var('chromium_git') + '/external/netty-tcnative.git' + '@' + '035726f76293d142ec3c4464be0703605feb4d02', @@ -1710,56 +2409,192 @@ deps = { 'src/third_party/ninja': { 'packages': [ { - 'package': 'infra/3pp/tools/ninja/${{platform}}', + 'package': Var('ninja_package') + '${{platform}}', 'version': Var('ninja_version'), } ], + 'condition': 'non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/siso': { + 'src/third_party/siso/cipd': { 'packages': [ { 'package': 'infra/build/siso/${{platform}}', 'version': Var('siso_version'), } ], + 'condition': 'non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/objenesis': { - 'packages': [ - { - 'package': 'chromium/third_party/objenesis', - 'version': 'tknDblENYi8IaJYyD6tUahUyHYZlzJ_Y74_QZSz4DpIC', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, 'src/third_party/openh264/src': - Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '09a4f3ec842a8932341b195c5b01e141c8a16eb7', + Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '478e5ab3eca30e600006d5a0a08b176fd34d3bd1', 'src/third_party/openscreen/src': - Var('chromium_git') + '/openscreen' + '@' + '4ec042afaf420eea2d6f2cfabfbb71b8810ea7a8', + Var('chromium_git') + '/openscreen' + '@' + '0d00500ef556027d2fe03d4fe2bf76f26bce4887', 'src/third_party/openxr/src': { - 'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '58a00cf85c39ad5ec4dc43a769624e420c06179a', + 'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '781f2eab3698d653c804ecbd11e0aed47eaad1c6', 'condition': 'checkout_openxr', }, + 'src/third_party/opus/tests/resources': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-webrtc-resources', + 'objects': [ + { + 'object_name': '009a3ee778767c2402b1d2c920bc2449265f5a2c', + 'sha256sum': '34de3161f242895a682d9cdcbbf4ad50246742b6db46873386104cfde8a24332', + 'size_bytes': 26889600, + 'generation': 1392811661954000, + 'output_file': 'speech_mono_32_48kHz.pcm', + }, + ], + }, + 'src/third_party/pdfium': Var('pdfium_git') + '/pdfium.git' + '@' + Var('pdfium_revision'), 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + 'fdaee3faea9e2e50a69eba1e3fbcf987039afc01', + Var('android_git') + '/platform/external/perfetto.git' + '@' + '943a0d89925e7f9a898c2e49c41feb9bf5dab71e', + + 'src/base/tracing/test/data': { + 'bucket': 'perfetto', + 'objects': [ + { + 'object_name': 'test_data/chrome_fcp_lcp_navigations.pftrace-ae01d849fbd75a98be1b7ddd5a8873217c377b393a1d5bbd788ed3364f7fefc3', + 'sha256sum': 'ae01d849fbd75a98be1b7ddd5a8873217c377b393a1d5bbd788ed3364f7fefc3', + 'size_bytes': 2398645, + 'generation': 1697714434866488, + 'output_file': 'chrome_fcp_lcp_navigations.pftrace' + }, + { + 'object_name': 'test_data/chrome_input_with_frame_view.pftrace-a93548822e481508c728ccc5da3ad34afcd0aec02ca7a7a4dad84ff340ee5975', + 'sha256sum': 'a93548822e481508c728ccc5da3ad34afcd0aec02ca7a7a4dad84ff340ee5975', + 'size_bytes': 6392331, + 'generation': 1711402389089075, + 'output_file': 'chrome_input_with_frame_view.pftrace' + }, + { + 'object_name': 'test_data/scroll_offsets_trace_2.pftrace-2ddd9f78d91d51e39c72c520bb54fdc9dbf1333ae722e87633fc345159296289', + 'sha256sum': '2ddd9f78d91d51e39c72c520bb54fdc9dbf1333ae722e87633fc345159296289', + 'size_bytes': 1496388, + 'generation': 1712592637141461, + 'output_file': 'scroll_offsets_trace_2.pftrace' + }, + { + 'object_name': 'test_data/top_level_java_choreographer_slices-8001e73b2458e94f65a606bb558a645ba5bca553b57fe416001f6c2175675a8a', + 'sha256sum': '8001e73b2458e94f65a606bb558a645ba5bca553b57fe416001f6c2175675a8a', + 'size_bytes': 5323017, + 'generation': 1671708979893186, + 'output_file': 'top_level_java_choreographer_slices' + }, + { + 'object_name': 'test_data/chrome_page_load_all_categories_not_extended.pftrace.gz-6586e9e2bbc0c996caddb321a0374328654983733e6ffd7f4635ac07db32a493', + 'sha256sum': '6586e9e2bbc0c996caddb321a0374328654983733e6ffd7f4635ac07db32a493', + 'size_bytes': 1277750, + 'generation': 1652442088902445, + 'output_file': 'chrome_page_load_all_categories_not_extended.pftrace.gz' + }, + { + 'object_name': 'test_data/speedometer_21.perfetto_trace.gz-8a159b354d74a3ca0d38ce9cd071ef47de322db4261ee266bfafe04d70310529', + 'sha256sum': '8a159b354d74a3ca0d38ce9cd071ef47de322db4261ee266bfafe04d70310529', + 'size_bytes': 891088, + 'generation': 1716566741068306, + 'output_file': 'speedometer_21.perfetto_trace.gz' + }, + { + 'object_name': 'test_data/speedometer_3.perfetto_trace.gz-b2c77fbe2c17363432a1ad0c05c1c1c20d3ebc62bda92c041d39918011af6f02', + 'sha256sum': 'b2c77fbe2c17363432a1ad0c05c1c1c20d3ebc62bda92c041d39918011af6f02', + 'size_bytes': 1301036, + 'generation': 1716566914245446, + 'output_file': 'speedometer_3.perfetto_trace.gz' + }, + { + 'object_name': 'test_data/scroll_jank_with_pinch.pftrace-8587d2016fdb5d39b5f852704b6e3925e9e6527af01696396be767bed04d4a45', + 'sha256sum': '8587d2016fdb5d39b5f852704b6e3925e9e6527af01696396be767bed04d4a45', + 'size_bytes': 3914720, + 'generation': 1717497788778335, + 'output_file': 'scroll_jank_with_pinch.pftrace' + }, + { + 'object_name': 'test_data/cpu_powerups_1.pb-70f5511ba0cd6ce1359e3cadb4d1d9301fb6e26be85158e3384b06f41418d386', + 'sha256sum': '70f5511ba0cd6ce1359e3cadb4d1d9301fb6e26be85158e3384b06f41418d386', + 'size_bytes': 2033064, + 'generation': 1669652389509708, + 'output_file': 'cpu_powerups_1.pb' + }, + { + 'object_name': 'test_data/chrome_5672_histograms.pftrace.gz-a09bd44078ac71bcfbc901b0544750e8344d0d0f6f96e220f700a5a53fa932ee', + 'sha256sum': 'a09bd44078ac71bcfbc901b0544750e8344d0d0f6f96e220f700a5a53fa932ee', + 'size_bytes': 1127472, + 'generation': 1684946598804577, + 'output_file': 'chrome_5672_histograms.pftrace.gz' + }, + { + 'object_name': 'test_data/chrome_custom_navigation_trace.gz-ff68279e3cec94076b69259d756eed181a63eaf834d8b956a7f4ba665fabf939', + 'sha256sum': 'ff68279e3cec94076b69259d756eed181a63eaf834d8b956a7f4ba665fabf939', + 'size_bytes': 7572484, + 'generation': 1666713705258900, + 'output_file': 'chrome_custom_navigation_trace.gz' + }, + { + 'object_name': 'test_data/scroll_offsets.pftrace-62101edb5204fec8bea30124f65d4e49bda0808d7b036e95f89445aaad6d8d98', + 'sha256sum': '62101edb5204fec8bea30124f65d4e49bda0808d7b036e95f89445aaad6d8d98', + 'size_bytes': 769741, + 'generation': 1693402148909129, + 'output_file': 'scroll_offsets.pftrace' + }, + { + 'object_name': 'test_data/chrome_input_with_frame_view_new.pftrace-e901ad9577088e62c921dd8bfcb43d652ecf49fa69b5b57f81bb3d27dbe94e12', + 'sha256sum': 'e901ad9577088e62c921dd8bfcb43d652ecf49fa69b5b57f81bb3d27dbe94e12', + 'size_bytes': 1967821, + 'generation': 1719520814352733, + 'output_file': 'chrome_input_with_frame_view_new.pftrace' + }, + { + 'object_name': 'test_data/scroll_m131.pftrace-14171c9e502a65a454f39fe14fce8b313c7012a2c14394bed496fc93b1644b0d', + 'sha256sum': '14171c9e502a65a454f39fe14fce8b313c7012a2c14394bed496fc93b1644b0d', + 'size_bytes': 1247290, + 'generation': 1729619115836875, + 'output_file': 'scroll_m131.pftrace' + }, + { + 'object_name': 'test_data/scroll_m132.pftrace-779e1fa6cab1abc0ab2dcafa4bbbf826ea8fc052878886ab168c783ca32f3bbe', + 'sha256sum': '779e1fa6cab1abc0ab2dcafa4bbbf826ea8fc052878886ab168c783ca32f3bbe', + 'size_bytes': 1854184, + 'generation': 1732117381568969, + 'output_file': 'scroll_m132.pftrace' + }, + { + 'object_name': 'test_data/scroll_m132_with_atrace.pftrace-b1fe189738a4a714cef7dd13b12318c89d6c4345fbe65096b4680ffa79f2872a', + 'sha256sum': 'b1fe189738a4a714cef7dd13b12318c89d6c4345fbe65096b4680ffa79f2872a', + 'size_bytes': 18887098, + 'generation': 1730148514067154, + 'output_file': 'scroll_m132_with_atrace.pftrace' + }, + { + 'object_name': 'test_data/scroll_with_input_not_forwarded_to_renderer.pftrace-ceb2ff3cb64c99ddb28a29867bc82f1491c4b413bfacd8638551b80936240faf', + 'sha256sum': 'ceb2ff3cb64c99ddb28a29867bc82f1491c4b413bfacd8638551b80936240faf', + 'size_bytes': 729606, + 'generation': 1732902685002882, + 'output_file': 'scroll_with_input_not_forwarded_to_renderer.pftrace' + }, + ], + 'dep_type': 'gcs' + }, 'src/third_party/perl': { - 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', + 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '8ef97ff3b7332e38e61b347a2fbed425a4617151', 'condition': 'checkout_win', }, + 'src/third_party/protobuf-javascript/src': + Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + 'e34549db516f8712f678fcd4bc411613b5cc5295', + 'src/third_party/pthreadpool/src': - Var('chromium_git') + '/external/github.com/Maratyszcza/pthreadpool.git' + '@' + '1787867f6183f056420e532eec640cba25efafea', + Var('chromium_git') + '/external/github.com/google/pthreadpool.git' + '@' + 'b4fb4eb1668c7d976cdaa941b135a02462adb460', # Dependency of skia. 'src/third_party/pyelftools': { @@ -1768,7 +2603,7 @@ deps = { }, 'src/third_party/quic_trace/src': - Var('chromium_git') + '/external/github.com/google/quic-trace.git' + '@' + 'caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc', + Var('chromium_git') + '/external/github.com/google/quic-trace.git' + '@' + '413da873d93a03d3662f24b881ea459a79f9c589', 'src/third_party/pywebsocket3/src': Var('chromium_git') + '/external/github.com/GoogleChromeLabs/pywebsocket3.git' + '@' + '50602a14f1b6da17e0b619833a13addc6ea78bc2', @@ -1777,38 +2612,51 @@ deps = { 'packages': [ { 'package': 'fuchsia/third_party/qemu/linux-arm64', - 'version': 'BpnoBb2d44_SOm9toN6Lju5a2RLGAc1TPUO6xyijoP8C' + 'version': 'MDf3sCxn9kct3Tg1oVRHch1hkzO6-9qZZFBRPT6jDuoC' }, ], + # TODO(b/351926334): Do not add `non_git_source` to this condition until the bug is fixed. + 'condition': 'host_os == "linux" and checkout_fuchsia and checkout_fuchsia_for_arm64_host', + 'dep_type': 'cipd', + }, + + 'src/third_party/edk2': { + 'packages': [ + { + 'package': 'fuchsia/third_party/edk2', + 'version': 'TfGjbhGrxzU0x2fYk8elEgwMTrvwe-3DSPTQe4gb0tMC' + }, + ], + # TODO(b/351926334): Do not add `non_git_source` to this condition until the bug is fixed. 'condition': 'host_os == "linux" and checkout_fuchsia and checkout_fuchsia_for_arm64_host', 'dep_type': 'cipd', }, 'src/third_party/re2/src': - Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + '73031bbc08cb3e3200497be4a50e37d6f3acc1d0', + Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + '6dcd83d60f7944926bfd308cc13979fc53dd69ca', - 'src/third_party/r8': { + 'src/third_party/r8/cipd': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': '5fmK4ltjLHNRPbUQ34VE7o4hXrmeRbwpUTtUPadhj0wC', + 'version': 'PO3aHSPf_6XsPQhr5ej6sRCj8EXUTKutmhlFCLBeak4C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, # This duplication is intentional, so we avoid updating the r8.jar used by # dexing unless necessary, since each update invalidates all incremental # dexing and unnecessarily slows down all bots. - 'src/third_party/r8/d8': { + 'src/third_party/r8/d8/cipd': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'vw5kLlW3-suSlCKSO9OQpFWpR8oDnvQ8k1RgKNUapQYC', + 'version': 'U3Jf_ewWOZyxa6vyO3wjNIgm8XIz1yFk-4k3-wqDL44C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -1817,47 +2665,65 @@ deps = { 'condition': 'checkout_android', }, - 'src/third_party/robolectric': { + 'src/third_party/robolectric/cipd': { 'packages': [ { 'package': 'chromium/third_party/robolectric', - 'version': 'hzetqh1qFI32FOgQroZvGcGdomrgVBJ6WKRnl1KFw6EC', + 'version': 'G3VkWqTv1YWDvC6zCrL34iQREzrzdBmSL4GMboAIiAEC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/ruy/src': - Var('chromium_git') + '/external/github.com/google/ruy.git' + '@' + 'c04e5e52ae6b144f74ac032652e3c538bda15c9b', + Var('chromium_git') + '/external/github.com/google/ruy.git' + '@' + '83fd40d730feb0804fafbc2d8814bcc19a17b2e5', + + 'src/third_party/search_engines_data/resources': + Var('chromium_git') + '/external/search_engines_data.git' + '@' + '34ba850d314fced586dfaaf5b099c4906ce17b2d', 'src/third_party/skia': Var('skia_git') + '/skia.git' + '@' + Var('skia_revision'), 'src/third_party/smhasher/src': - Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', + Var('chromium_git') + '/external/smhasher.git' + '@' + '0ff96f7835817a27d0487325b6c16033e2992eb5', 'src/third_party/snappy/src': - Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + 'c9f9edf6d75bb065fa47468bf035e051a57bec7c', + Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + '32ded457c0b1fe78ceb8397632c416568d6714a0', 'src/third_party/sqlite/src': - Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + 'b7e480172bb2411f9afedefdcc69a57a12f18b7b', + Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + '567495a62a62dc013888500526e82837d727fe01', - 'src/third_party/sqlite4java': { + 'src/third_party/sqlite4java/cipd': { 'packages': [ { 'package': 'chromium/third_party/sqlite4java', 'version': 'LofjKH9dgXIAJhRYCPQlMFywSwxYimrfDeBmaHc-Z5EC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, + 'src/third_party/subresource-filter-ruleset/data': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-ads-detection', + 'objects': [ + { + 'object_name': 'fd3ade759bd847f845fe201167de1f53e53a2275631303952f1ac4d7ab5b19dc', + 'sha256sum': 'fd3ade759bd847f845fe201167de1f53e53a2275631303952f1ac4d7ab5b19dc', + 'size_bytes': 75385, + 'generation': 1736370299437547, + 'output_file': 'UnindexedRules', + }, + ], + }, + 'src/third_party/swift-format': { 'packages': [ { - 'package': 'infra/3pp/tools/swift-format/${{platform}}', + 'package': 'infra/3pp/tools/swift-format/mac-${{arch}}', 'version': 'version:2@505.chromium.1', }, ], @@ -1879,37 +2745,62 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/test_fonts/test_fonts': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-fonts', + 'objects': [ + { + 'object_name': 'f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35', + 'sha256sum': 'f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35', + 'size_bytes': 32750602, + 'generation': 1717109450425063, + }, + ], + }, + 'src/third_party/text-fragments-polyfill/src': Var('chromium_git') + '/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git' + '@' + 'c036420683f672d685e27415de0a5f5e85bdc23f', 'src/third_party/tflite/src': - Var('chromium_git') + '/external/github.com/tensorflow/tensorflow.git' + '@' + '91946956f81a2d9fd12a6d6baba20c997d3f8890', + Var('chromium_git') + '/external/github.com/tensorflow/tensorflow.git' + '@' + 'b7bed6cb1d5eeebd81324b60d8bd624b9124ef5b', - 'src/third_party/turbine': { + 'src/third_party/turbine/cipd': { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': 'ZlMS4BOYyYmbU8BuBDGyW7QrkvZ_-pTkm4lH4jKjTi4C', + 'version': 'dz8pRLjwNlToJ0tS14T-TDQJNikmFXEDByMo-OzBbl0C', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@5cfecc8eccdbfb2b0d81b3ae922810b91365d68d', + 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@f840db3658c06bd08b603abbcab799b1157c3099', + 'src/third_party/glslang/src': '{chromium_git}/external/github.com/KhronosGroup/glslang@b5dc38707208efae0b7a1606790ca33d237d950e', + 'src/third_party/spirv-cross/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@b8fcf307f1f347089e3c46eb4451d27f32ebc8d3', + 'src/third_party/spirv-headers/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@2b2e05e088841c63c0b6fd4c9fb380d8688738d3', + 'src/third_party/spirv-tools/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@321692686b64873ccf4972754e36185697993e21', + 'src/third_party/vulkan-headers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@d4a196d8c84e032d27f999adcea3075517c1c97f', + 'src/third_party/vulkan-loader/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@35a851d182cdebef408493b9a82ba212d1a2629c', + 'src/third_party/vulkan-tools/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@315964ad5aabd5b148a484e5fbea8a365c8d1eb3', + 'src/third_party/vulkan-utility-libraries/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@2fe3a7791dc9c34a581dc45522ab9b4363b4f321', + 'src/third_party/vulkan-validation-layers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@a80bafccd11d2b4e44dee21c530da49b41083682', 'src/third_party/vulkan_memory_allocator': - Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + 'e87036508bb156f9986ea959323de1869e328f58', + Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '56300b29fbfcc693ee6609ddad3fdd5b7a449a21', + + 'src/third_party/wasm_tts_engine/src': Var('chromium_git') + '/chromium/wasm-tts-engine' + '@' + '6d5bc87a28e49361dac2964015957698b04a0df8', # Display server protocol for Linux. 'src/third_party/wayland/src': { - 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland.git' + '@' + 'a8c7553ec9af6462474524fd2bb4e9a7dc7217dd', + 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland.git' + '@' + 'a156431ea66fe67d69c9fbba8a8ad34dabbab81c', 'condition': 'checkout_linux', }, # Wayland protocols that add functionality not available in the core protocol. 'src/third_party/wayland-protocols/src': { - 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git' + '@' + '4624cfaaf563cd7be5e2e2087c8de6d3a48ea867', + 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git' + '@' + '7d5a3a8b494ae44cd9651f9505e88a250082765e', 'condition': 'checkout_linux', }, @@ -1930,21 +2821,30 @@ deps = { Var('chromium_git') + '/external/github.com/SeleniumHQ/selenium/py.git' + '@' + 'fc5e7e70c098bfb189a9a74746809ad3c5c34e04', 'src/third_party/webgl/src': - Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '3e71f3b643f8095babbd46cf4e7d34e4f1ddf7a8', + Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '450cceb587613ac1469c5a131fac15935c99e0e7', 'src/third_party/webgpu-cts/src': - Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '2ee990a4cb91b41491f83b52c9520476b18a9fd8', + Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '927348025a551f17d020789b3f31bc00de430016', + + 'src/third_party/webpagereplay': + Var('chromium_git') + '/webpagereplay.git' + '@' + Var('webpagereplay_revision'), 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'c89fdbe62490193ce7c9cbde0d39d3d622f4ed08', + Var('webrtc_git') + '/src.git' + '@' + '9165a9b4365c101c04465af21e5943b936d854f8', # Wuffs' canonical repository is at github.com/google/wuffs, but we use # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file. + # + # The local directory is called "third_party/wuffs" (matching upstream Skia + # and other non-Chromium, Skia-using projects) even though the git repo we + # clone is called "wuffs-mirror-release-c". The reasons for using w-m-r-c are + # listed in the https://crrev.com/c/3086053 commit message. One reason is + # that the w-m-r-c subset is much smaller and changes much less frequently. 'src/third_party/wuffs/src': Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + Var('wuffs_revision'), 'src/third_party/weston/src': { - 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/weston.git' + '@' + '420cfd00f2de91de74bd9d4d8348e43c582d29f0', + 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/weston.git' + '@' + 'ccf29cb237c3ed09c5f370f35239c93d07abfdd7', 'condition': 'checkout_linux', }, @@ -1956,47 +2856,44 @@ deps = { }, 'src/third_party/xdg-utils': { - 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d', + 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'cb54d9db2e535ee4ef13cc91b65a1e2741a94a44', 'condition': 'checkout_linux', }, 'src/third_party/xnnpack/src': - Var('chromium_git') + '/external/github.com/google/XNNPACK.git' + '@' + 'b9d4073a6913891ce9cbd8965c8d506075d2a45a', - - 'src/tools/page_cycler/acid3': - Var('chromium_git') + '/chromium/deps/acid3.git' + '@' + 'a926d0a32e02c4c03ae95bb798e6c780e0e184ba', + Var('chromium_git') + '/external/github.com/google/XNNPACK.git' + '@' + '0824e2965f6edc2297e55c8dff5a8ac4cb12aaad', - 'src/third_party/libei': { + 'src/third_party/libei/cipd': { 'packages': [ { 'package': 'chromium/third_party/libei/linux-amd64', - 'version': 'PQz4zG5Q3SXoAaCYq3RK99W3wg_v0NoOu1OzTSvA_oIC', + 'version': '7V4n9OUxAo8k8zayCwZ47Bc5Mqr7Br1NXrxeMKXYBNQC', }, ], - 'condition': 'checkout_linux', + 'condition': 'checkout_linux and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/zstd/src': - Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '25822342be59d831bad65426ae51f5cc22157b09', + Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '80af41e08a630946a75a5cda9e4cdf192247f20a', 'src/tools/skia_goldctl/linux': { 'packages': [ { 'package': 'skia/tools/goldctl/linux-amd64', - 'version': 'FdyOkAznuQ7k2iieFXsUTpz6jBaUHPGw8fNxb1-0JLMC', + 'version': '1TplvrLyzA9FlWhQRWdX9SaTfuZaPdvQ9BMG0wNhy98C', }, ], 'dep_type': 'cipd', - 'condition': 'checkout_linux', + 'condition': 'checkout_linux and non_git_source', }, 'src/tools/skia_goldctl/win': { 'packages': [ { 'package': 'skia/tools/goldctl/windows-amd64', - 'version': '3VsnMzWsw1jy9-ZgvgPjR5emUA1IwrCNkX8xYK8oxFgC', + 'version': 'iu7P4Y4eMVlvfq6mCvSlP12RQuqVdmIjndnnxIbxy4IC', }, ], 'dep_type': 'cipd', @@ -2007,7 +2904,7 @@ deps = { 'packages': [ { 'package': 'skia/tools/goldctl/mac-amd64', - 'version': '9RuiM5HJiEHkr27MLsTx04jOTEYQG-D_3P1BCrM03q4C', + 'version': 'i1pCGOButmwiJERJNRCcVJvvq5eJVXmgn6naqj5pIUwC', }, ], 'dep_type': 'cipd', @@ -2018,7 +2915,7 @@ deps = { 'packages': [ { 'package': 'skia/tools/goldctl/mac-arm64', - 'version': 'tDNHYe-tSHHr68Th6urfIcXLngT2yJ2jCyZBQLAB5mYC', + 'version': 'J_hsft9STSA1c91EbHgGONUGi_KYtolnyIbXIM_1ps8C', }, ], 'dep_type': 'cipd', @@ -2048,7 +2945,18 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/eche_app/app', - 'version': 'f5Rd655OB0qwwkjv7MQ4k0HK-YieLfZ04I8YiSvWHY8C', + 'version': 'RN0xvjleQ3cZb_0ADjJThZ6BHBE0zBg_k95_J3T6E34C', + }, + ], + 'condition': 'checkout_chromeos and checkout_src_internal', + 'dep_type': 'cipd', + }, + + 'src/ash/webui/boca_ui/resources/prod': { + 'packages': [ + { + 'package': 'chromeos_internal/apps/boca_app/app', + 'version': 'HLx95FmliWdD09Y28e8fId9NaE9l4YjX1kNLSEch7TUC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2059,7 +2967,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'XuDbmWI15WyT_3xdBB6Q-vxPydRh9b7Ie3qPx9f38XYC', + 'version': 'uMy7vOfonOvlppmthaEbPS0Hk5Fu-VCTlEycHHlHY6IC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2070,7 +2978,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': 'eCk59QLGrOGxZpwAC5CLdvbgcNCZ5xMUXtlVZqhGT3IC', + 'version': 'CqrRs-8NaEMyLsBk1WrbKynksiwxfaMLnT2fKqSH8PYC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2103,1924 +3011,1277 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/projector_app/app', - 'version': 'm4NcX19cjuzBJmYAn-rL2tR-JK7N6E7ht6NYVPTx8lsC', + 'version': 'I6qYL1WbVeH_3Cp8TM4r42OxK6gcYxPqjIS2IkvTFdwC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', 'dep_type': 'cipd', }, - 'src/third_party/webpagereplay': { + 'src/third_party/webpagereplay/cipd': { 'packages' : [ { 'package': 'infra/tools/wpr/linux_x86_64', 'version': 'y28SfbEF6nHSkZ1eHysM1t711zpOCmtk7jUdxZB-QSMC', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/android_prebuilts/build_tools': { - 'url': Var('android_git') + '/platform/prebuilts/build-tools.git' + '@' + '673c20b524a83b662d8c1057fd3eec8fd0f93f9d', + 'url': Var('android_git') + '/platform/prebuilts/build-tools.git' + '@' + '3fbcdf38727f967badc13f9537bda0b4392c1f74', 'condition': 'checkout_android_prebuilts_build_tools', }, - # TODO(crbug.com/1290782): This should ideally be replaced with recursdeps, - # but that arises concern which revision of devtools-frontend we should use - # between public and internal build. So we have copy of CIPD deps from - # devtools-frontend for now here. - 'src/third_party/devtools-frontend/src/third_party/esbuild': { + # === ANDROID_DEPS Generated Code Start === + # Generated by //third_party/android_deps/fetch_all.py + 'src/third_party/android_deps/cipd/libs/com_android_support_support_annotations': { 'packages': [ { - 'package': 'infra/3pp/tools/esbuild/${{platform}}', - # This should be synced with devtools-frontend DEPS. - 'version': 'version:2@0.14.13.chromium.2', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', + 'version': 'version:2@28.0.0.cr1', }, ], + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - # === ANDROID_DEPS Generated Code Start === - # Generated by //third_party/android_deps/fetch_all.py - 'src/third_party/android_deps/libs/android_arch_core_common': { + 'src/third_party/android_deps/cipd/libs/com_android_tools_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', + 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_core_runtime': { + 'src/third_party/android_deps/cipd/libs/com_android_tools_layoutlib_layoutlib_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_core_runtime', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api', + 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_lifecycle_common': { + 'src/third_party/android_deps/cipd/libs/com_android_tools_sdk_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', + 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_lifecycle_common_java8': { + 'src/third_party/android_deps/cipd/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework', + 'version': 'version:2@4.1.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_lifecycle_livedata': { + 'src/third_party/android_deps/cipd/libs/com_google_android_datatransport_transport_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', + 'version': 'version:2@2.2.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_lifecycle_livedata_core': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata_core', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', + 'version': 'version:2@21.1.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_lifecycle_runtime': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_api_phone': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', + 'version': 'version:2@18.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/android_arch_lifecycle_viewmodel': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_base': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_viewmodel', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', + 'version': 'version:2@18.0.10.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_blockstore': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_blockstore', + 'version': 'version:2@16.4.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_appcompat_v7': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_base': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', + 'version': 'version:2@18.5.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_asynclayoutinflater': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_basement': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_asynclayoutinflater', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', + 'version': 'version:2@18.5.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_cardview_v7': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_collections': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast_framework': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_collections', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_coordinatorlayout': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_clearcut': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_coordinatorlayout', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_cursoradapter': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cloud_messaging': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_cursoradapter', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', + 'version': 'version:2@16.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_customview': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_fido': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_customview', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', + 'version': 'version:2@21.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_design': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_flags': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_design', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_documentfile': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_gcm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_documentfile', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_drawerlayout': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_identity_credentials': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_drawerlayout', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials', + 'version': 'version:2@16.0.0-alpha04.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_interpolator': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_iid': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_interpolator', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_loader': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_instantapps': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_loader', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', + 'version': 'version:2@18.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_localbroadcastmanager': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_location': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_localbroadcastmanager', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', + 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_multidex': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_phenotype': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex', - 'version': 'version:2@1.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_print': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_stats': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_print', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_recyclerview_v7': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_tasks': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', + 'version': 'version:2@18.2.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_slidingpanelayout': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_slidingpanelayout', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', + 'version': 'version:2@20.1.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', + 'version': 'version:2@19.1.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_compat': { + 'src/third_party/android_deps/cipd/libs/com_google_android_libraries_identity_googleid_googleid': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_libraries_identity_googleid_googleid', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_core_ui': { + 'src/third_party/android_deps/cipd/libs/com_google_android_material_material': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', + 'version': 'version:2@1.13.0-alpha05.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_core_utils': { + 'src/third_party/android_deps/cipd/libs/com_google_android_play_core_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_common', + 'version': 'version:2@2.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_fragment': { + 'src/third_party/android_deps/cipd/libs/com_google_android_play_feature_delivery': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_feature_delivery', + 'version': 'version:2@2.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_media_compat': { + 'src/third_party/android_deps/cipd/libs/com_google_auto_service_auto_service_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', + 'version': 'version:2@1.0-rc6.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_v4': { + 'src/third_party/android_deps/cipd/libs/com_google_auto_value_auto_value_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', + 'version': 'version:2@1.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_vector_drawable': { + 'src/third_party/android_deps/cipd/libs/com_google_code_findbugs_jsr305': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', + 'version': 'version:2@3.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_swiperefreshlayout': { + 'src/third_party/android_deps/cipd/libs/com_google_code_gson_gson': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_swiperefreshlayout', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', + 'version': 'version:2@2.8.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_transition': { + 'src/third_party/android_deps/cipd/libs/com_google_dagger_dagger': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_transition', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', + 'version': 'version:2@2.52.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_versionedparcelable': { + 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_versionedparcelable', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', + 'version': 'version:2@2.30.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_viewpager': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager', - 'version': 'version:2@28.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', + 'version': 'version:2@16.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_tools_common': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', - 'version': 'version:2@30.2.0-beta01.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', + 'version': 'version:2@19.5.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_components': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api', - 'version': 'version:2@30.2.0-beta01.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', + 'version': 'version:2@16.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_tools_sdk_common': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', - 'version': 'version:2@30.2.0-beta01.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', + 'version': 'version:2@16.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders_json': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', - 'version': 'version:2@2.8.8.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', + 'version': 'version:2@17.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', - 'version': 'version:2@1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', + 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid_interop': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_annotations', - 'version': 'version:2@4.1.1.4.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework', - 'version': 'version:2@4.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', + 'version': 'version:2@16.3.5.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_datatransport_transport_api': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations_interop': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', - 'version': 'version:2@2.2.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', + 'version': 'version:2@16.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_measurement_connector': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:2@20.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', + 'version': 'version:2@18.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_messaging': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:2@18.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', + 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base': { + 'src/third_party/android_deps/cipd/libs/com_google_guava_failureaccess': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', - 'version': 'version:2@18.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', + 'version': 'version:2@1.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_base': { + 'src/third_party/android_deps/cipd/libs/com_google_guava_guava': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', - 'version': 'version:2@18.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', + 'version': 'version:2@33.3.1-jre.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_basement': { + 'src/third_party/android_deps/cipd/libs/com_google_guava_guava_android': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', - 'version': 'version:2@18.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', + 'version': 'version:2@33.3.1-android.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast': { + 'src/third_party/android_deps/cipd/libs/com_google_j2objc_j2objc_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', + 'version': 'version:2@3.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework': { + 'src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_javalite': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', + 'version': 'version:2@4.28.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut': { + 'src/third_party/android_deps/cipd/libs/com_google_testparameterinjector_test_parameter_injector': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_testparameterinjector_test_parameter_injector', + 'version': 'version:2@1.18.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging': { + 'src/third_party/android_deps/cipd/libs/com_googlecode_java_diff_utils_diffutils': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', - 'version': 'version:2@16.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', + 'version': 'version:2@1.3.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_flags': { + 'src/third_party/android_deps/cipd/libs/com_squareup_javapoet': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', + 'version': 'version:2@1.13.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm': { + 'src/third_party/android_deps/cipd/libs/com_squareup_javawriter': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', + 'version': 'version:2@2.1.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_iid': { + 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_moshi_moshi', + 'version': 'version:2@1.15.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps': { + 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi_adapters': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', - 'version': 'version:2@18.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_moshi_moshi_adapters', + 'version': 'version:2@1.15.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_location': { + 'src/third_party/android_deps/cipd/libs/com_squareup_okio_okio_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', - 'version': 'version:2@19.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_okio_okio_jvm', + 'version': 'version:2@3.9.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype': { + 'src/third_party/android_deps/cipd/libs/com_squareup_wire_wire_runtime_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm', + 'version': 'version:2@5.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport': { + 'src/third_party/android_deps/cipd/libs/jakarta_inject_jakarta_inject_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/jakarta_inject_jakarta_inject_api', + 'version': 'version:2@2.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_stats': { + 'src/third_party/android_deps/cipd/libs/javax_annotation_javax_annotation_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', + 'version': 'version:2@1.3.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks': { + 'src/third_party/android_deps/cipd/libs/javax_annotation_jsr250_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', - 'version': 'version:2@18.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', + 'version': 'version:2@1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision': { + 'src/third_party/android_deps/cipd/libs/javax_inject_javax_inject': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', - 'version': 'version:2@20.1.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', + 'version': 'version:2@1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common': { + 'src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', - 'version': 'version:2@19.1.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy', + 'version': 'version:2@1.14.12.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_material_material': { + 'src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy_agent': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', - 'version': 'version:2@1.7.0-alpha02.cr1', + 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent', + 'version': 'version:2@1.14.12.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_play_core_common': { + 'src/third_party/android_deps/cipd/libs/org_bouncycastle_bcprov_jdk18on': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_common', - 'version': 'version:2@2.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on', + 'version': 'version:2@1.78.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_play_feature_delivery': { + 'src/third_party/android_deps/cipd/libs/org_ccil_cowan_tagsoup_tagsoup': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_feature_delivery', - 'version': 'version:2@2.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', + 'version': 'version:2@1.2.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_auto_auto_common': { + 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_compat_qual': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', - 'version': 'version:2@1.2.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', + 'version': 'version:2@2.5.5.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_auto_service_auto_service': { + 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_qual': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', - 'version': 'version:2@1.0-rc6.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', + 'version': 'version:2@3.43.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations': { + 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_util': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', - 'version': 'version:2@1.0-rc6.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_util', + 'version': 'version:2@3.25.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations': { + 'src/third_party/android_deps/cipd/libs/org_codehaus_mojo_animal_sniffer_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', - 'version': 'version:2@1.10.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', + 'version': 'version:2@1.17.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': { + 'src/third_party/android_deps/cipd/libs/org_conscrypt_conscrypt_openjdk_uber': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', - 'version': 'version:2@3.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber', + 'version': 'version:2@2.5.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_code_gson_gson': { + 'src/third_party/android_deps/cipd/libs/org_hamcrest_hamcrest': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', - 'version': 'version:2@2.9.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_hamcrest_hamcrest', + 'version': 'version:2@2.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', - 'version': 'version:2@2.30.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime', + 'version': 'version:2@1.9.22.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger_compiler': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', - 'version': 'version:2@2.30.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime', + 'version': 'version:2@1.9.22.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger_producers': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_atomicfu_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', - 'version': 'version:2@2.30.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm', + 'version': 'version:2@0.23.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', - 'version': 'version:2@2.30.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android', + 'version': 'version:2@1.8.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', - 'version': 'version:2@2.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', + 'version': 'version:2@1.8.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2@2.18.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava', + 'version': 'version:2@1.8.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', - 'version': 'version:2@2.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm', + 'version': 'version:2@1.7.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_core': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', - 'version': 'version:2@2.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm', + 'version': 'version:2@1.7.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations': { + 'src/third_party/android_deps/cipd/libs/org_jsoup_jsoup': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', - 'version': 'version:2@2.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jsoup_jsoup', + 'version': 'version:2@1.15.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_javac': { + 'src/third_party/android_deps/cipd/libs/org_jspecify_jspecify': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', - 'version': 'version:2@9+181-r4173-1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jspecify_jspecify', + 'version': 'version:2@1.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': { + 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_android': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', - 'version': 'version:2@9-dev-r4023-3.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_android', + 'version': 'version:2@5.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_annotations': { + 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_core': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', - 'version': 'version:2@16.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_core', + 'version': 'version:2@5.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_common': { + 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_subclass': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', - 'version': 'version:2@19.5.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_subclass', + 'version': 'version:2@5.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_components': { + 'src/third_party/android_deps/cipd/libs/org_objenesis_objenesis': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', - 'version': 'version:2@16.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_objenesis_objenesis', + 'version': 'version:2@3.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', - 'version': 'version:2@16.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_analysis': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', - 'version': 'version:2@17.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_commons': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', - 'version': 'version:2@21.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_tree': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_util': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', - 'version': 'version:2@16.3.5.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', - 'version': 'version:2@16.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_junit': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', - 'version': 'version:2@18.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_messaging': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', - 'version': 'version:2@21.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime_dist_compat': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', - 'version': 'version:2@1.5.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat', + 'version': 'version:2@1.0.16.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_failureaccess': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_pluginapi': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', - 'version': 'version:2@1.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_guava': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_plugins_maven_dependency_resolver': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', - 'version': 'version:2@31.1-jre.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_guava_android': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_resources': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', - 'version': 'version:2@31.1-android.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_listenablefuture': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_robolectric': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture', - 'version': 'version:2@1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_sandbox': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', - 'version': 'version:2@1.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_java': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_shadowapi': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java', - 'version': 'version:2@3.19.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_shadows_framework': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:2@3.21.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_utils': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', - 'version': 'version:2@1.3.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_javapoet': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_utils_reflector': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', - 'version': 'version:2@1.13.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_javawriter': { + 'src/third_party/android_deps/cipd/libs/org_yaml_snakeyaml': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', - 'version': 'version:2@2.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_yaml_snakeyaml', + 'version': 'version:2@2.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_okio_okio_jvm': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_okio_okio_jvm', - 'version': 'version:2@3.3.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm', - 'version': 'version:2@4.7.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils', - 'version': 'version:2@4.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_api', - 'version': 'version:2@1.49.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_binder': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_binder', - 'version': 'version:2@1.49.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_context': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_context', - 'version': 'version:2@1.49.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_core': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_core', - 'version': 'version:2@1.49.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite', - 'version': 'version:2@1.49.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_stub': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_stub', - 'version': 'version:2@1.49.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_perfmark_perfmark_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_perfmark_perfmark_api', - 'version': 'version:2@0.25.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', - 'version': 'version:2@1.3.2.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/javax_annotation_jsr250_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', - 'version': 'version:2@1.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/javax_inject_javax_inject': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', - 'version': 'version:2@1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/net_bytebuddy_byte_buddy': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy', - 'version': 'version:2@1.14.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent', - 'version': 'version:2@1.14.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/net_ltgt_gradle_incap_incap', - 'version': 'version:2@0.2.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on', - 'version': 'version:2@1.72.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', - 'version': 'version:2@1.2.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', - 'version': 'version:2@2.5.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_checkerframework_checker_qual': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', - 'version': 'version:2@3.25.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_checkerframework_checker_util': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_util', - 'version': 'version:2@3.25.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone', - 'version': 'version:2@3.15.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', - 'version': 'version:2@1.21.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber', - 'version': 'version:2@2.5.2.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit', - 'version': 'version:2@4.4.1.201607150455-r.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_hamcrest_hamcrest': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_hamcrest_hamcrest', - 'version': 'version:2@2.2.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7', - 'version': 'version:2@1.8.20.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8', - 'version': 'version:2@1.8.20.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android', - 'version': 'version:2@1.6.4.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', - 'version': 'version:2@1.6.4.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava', - 'version': 'version:2@1.6.4.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm', - 'version': 'version:2@0.1.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_jsoup_jsoup': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_jsoup_jsoup', - 'version': 'version:2@1.15.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_mockito_mockito_android': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_android', - 'version': 'version:2@5.4.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_mockito_mockito_core': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_core', - 'version': 'version:2@5.4.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_mockito_mockito_subclass': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_subclass', - 'version': 'version:2@5.4.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_objenesis_objenesis': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_objenesis_objenesis', - 'version': 'version:2@3.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_ow2_asm_asm': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', - 'version': 'version:2@9.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_ow2_asm_asm_analysis': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', - 'version': 'version:2@9.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_ow2_asm_asm_commons': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', - 'version': 'version:2@9.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_ow2_asm_asm_tree': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', - 'version': 'version:2@9.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_ow2_asm_asm_util': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', - 'version': 'version:2@9.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_pcollections_pcollections': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', - 'version': 'version:2@3.1.4.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_annotations': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_junit': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_nativeruntime': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat', - 'version': 'version:2@1.0.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_pluginapi': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_resources': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_robolectric': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_sandbox': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_shadowapi': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_shadows_framework': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_shadows_playservices': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_utils': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_utils_reflector': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - # === ANDROID_DEPS Generated Code End === - - 'src/tools/resultdb': { + # === ANDROID_DEPS Generated Code End === + + 'src/tools/resultdb': { 'packages': [ { 'package': 'infra/tools/result_adapter/${{platform}}', 'version': Var('resultdb_version'), }, ], + 'condition': 'non_git_source', 'dep_type': 'cipd', }, - 'src/tools/bazel/linux-amd64': { - 'packages': [{ - 'package': 'infra/3pp/tools/bazel_bootstrap/linux-amd64', - 'version': 'version:2@5.3.2.1', - }], - 'dep_type': 'cipd', - 'condition': 'host_os == "linux" and checkout_bazel', - }, - - 'src/tools/bazel/mac-amd64': { - 'packages': [{ - 'package': 'infra/3pp/tools/bazel_bootstrap/mac-amd64', - 'version': 'version:2@5.3.2.1', - }], - 'dep_type': 'cipd', - 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_bazel', - }, - - 'src/tools/bazel/mac-arm64': { - 'packages': [{ - 'package': 'infra/3pp/tools/bazel_bootstrap/mac-arm64', - 'version': 'version:2@5.3.2.1', - }], - 'dep_type': 'cipd', - 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_bazel', - }, - - 'src/tools/bazel/windows-amd64': { - 'packages': [{ - 'package': 'infra/3pp/tools/bazel_bootstrap/windows-amd64', - 'version': 'version:2@5.3.2', - }], - 'dep_type': 'cipd', - 'condition': 'host_os == "win" and checkout_bazel', + # Dependencies from src_internal + 'src/chromeos/ash/resources/internal': { + 'url': Var('chrome_git') + '/chrome/chromeos/ash/resources/internal.git' + '@' + + 'dd3d2b0c1e780a13f6716cdbd20b2489811f0218', + 'condition': 'checkout_src_internal and checkout_chromeos', }, - # Dependencies from src_internal 'src/chromeos/assistant/internal': { 'url': Var('chrome_git') + '/chrome/assistant.git' + '@' + - 'be573fb2c5ba762c5100c39b4b57baeec0877c65', + '366dc486f8f18d097f22acb469b8eab41b14c9ad', 'condition': 'checkout_src_internal and checkout_chromeos', }, 'src/ui/gl/resources/angle-metal': { 'packages': [{ 'package': 'chromium/gpu/angle-metal-shader-libraries', - 'version': 'aeUpC6kkTbhimw4m_7ricveccDcAXfa8H5ww_LGerdYC', + 'version': 'S0FPOVKrgaiqyuR20SSHiPorLgYez29bfwEdKBobUMMC', }], 'dep_type': 'cipd', 'condition': 'checkout_mac or checkout_ios', }, + 'src/buildtools/android/doclava': { + 'dep_type': 'gcs', + 'bucket': 'chromium-doclava', + 'condition': 'checkout_android and non_git_source', + 'objects': [ + { + 'object_name': '1931becb8a8e21685f39c62854e9e814d64ccf1a', + 'sha256sum': '935a602c0dda7f769fc48fc777697ea23ccead170fbc70d2d41af5713ef50bbf', + 'size_bytes': 3517760, + 'generation': 1516199210583319, + }, + ], + }, # Repositories from src_internal 'src/build/fuchsia/internal': { 'url': Var('chrome_git') + '/fuchsia/build.git' + '@' + @@ -4030,19 +4291,19 @@ deps = { 'src/chrome/app/theme/default_100_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/theme/default_100_percent/google_chrome.git' + '@' + - '364a7bfc4cec1e32257a2b9ae12f5354fa4709bb', + 'c5fa2fa6eebebdd7a8f6886cff6968b59b63284f', 'condition': 'checkout_src_internal', }, 'src/chrome/app/theme/default_200_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/theme/default_200_percent/google_chrome.git' + '@' + - '422d4257f3f9f3c2f6b03d8033c61f0cbbece8b4', + '323e8f4ce9be0212708cce6b765a632a1a9d824c', 'condition': 'checkout_src_internal', }, 'src/chrome/app/theme/google_chrome': { 'url': Var('chrome_git') + '/chrome/theme/google_chrome.git' + '@' + - 'fd5f28534a5255022dd9cee6915e76755f87cc2f', + '1d807d1b5ffc29e13e3c05260ce8a44401e3582d', 'condition': 'checkout_src_internal', }, @@ -4060,7 +4321,7 @@ deps = { 'src/chrome/browser/internal': { 'url': Var('chrome_git') + '/chrome/browser_internal.git' + '@' + - 'e7e78db02b503924ba5047b3b211ff1846be8335', + '5649dd0237ac7f75c2779ff757e8666bdb9d2674', 'condition': 'checkout_src_internal', }, @@ -4070,15 +4331,33 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/chrome/browser/resources/chromeos/quickoffice': { - 'url': Var('chrome_git') + '/quickoffice/crx.git' + '@' + - '23bde3495989fbc0112213613d2498030be51417', - 'condition': '(checkout_chromeos or checkout_linux) and checkout_src_internal', + 'src/chrome/browser/nearby_sharing/internal': { + 'url': Var('chrome_git') + '/chrome/browser/nearby_sharing/internal.git' + '@' + + '5fe4183de2df3467add81f4610f79ea1dde41a48', + 'condition': 'checkout_src_internal', + }, + + 'src/chrome/browser/platform_experience/win': { + 'url': Var('chrome_git') + '/chrome/browser/platform_experience/win.git' + '@' + + '4d37f316b79229e3ec9e021f6e7590f190dd0134', + 'condition': 'checkout_src_internal', + }, + + 'src/chrome/browser/request_header_integrity/internal': { + 'url': Var('chrome_git') + '/chrome/browser/request_header_integrity/internal.git' + '@' + + '1592aa7ba598a048f918f54735bcf056556532c3', + 'condition': 'checkout_src_internal', + }, + + 'src/chrome/browser/resources/downloads/internal': { + 'url': Var('chrome_git') + '/chrome/browser/resources/downloads_internal.git' + '@' + + '4fefb8a24ae6c421f640b9ef028e4b4ca75df729', + 'condition': 'checkout_src_internal', }, - 'src/chrome/browser/resources/settings_internal': { + 'src/chrome/browser/resources/settings/internal': { 'url': Var('chrome_git') + '/chrome/browser/resources/settings_internal.git' + '@' + - '5d6316b2434986e6b073e1d24585578bb27da451', # from svn revision 41419 + 'bc502cc43fa3999514c63c96aa75239c9d1acf91', # from svn revision 41419 'condition': 'checkout_src_internal', }, @@ -4088,17 +4367,39 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/chrome/chrome_cleaner/internal': { - 'url': Var('chrome_git') + '/protector/foil.git' + '@' + - 'f7839edf1403546f1ebc5bff62319d32e21529ab', - 'condition': 'checkout_chrome_cleaner_internal and checkout_src_internal', + 'src/chrome/browser/resources/chromeos/mako/resources': { + 'packages' : [ + { + 'package': 'chromeos_internal/inputs/orca', + 'version': 'u9vK3nIWSWZ0y9DalJGOfXqsbdZOBq4nZCLO3fc6tc0C' + } + ], + 'condition': 'checkout_chromeos and checkout_src_internal', + 'dep_type': 'cipd', + }, + + 'src/chrome/browser/resources/chromeos/seal/resources': { + 'packages' : [ + { + 'package': 'chromeos_internal/inputs/seal', + 'version': '11AdGL1RBEo2LflLT5Vc8Q3vBfjsHQAuH5jAhUBxL9QC' + } + ], + 'condition': 'checkout_chromeos and checkout_src_internal', + 'dep_type': 'cipd', + }, + + 'src/chrome/elevation_service/internal': { + 'url': Var('chrome_git') + '/chrome/elevation_service/internal.git' + '@' + + 'c13ff6fa7c879977a9c92e1d753164f4119e41e1', + 'condition': 'checkout_src_internal and checkout_win', }, # Installer bits used only by Mac, but mapped for all OSes to ease source # grepping. 'src/chrome/installer/mac/internal': { 'url': Var('chrome_git') + '/chrome/installer/mac/internal.git' + '@' + - 'd7fb448e1fc84c05c40719d83d785fe2a131e616', + '85c282fe6f2763822964028cb89be7b808b07169', 'condition': 'checkout_src_internal', }, @@ -4144,12 +4445,6 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/chrome/test/python_tests': { - 'url': Var('chrome_git') + '/chrome/test/python_tests.git' + '@' + - '644bd7703b85f148564cc4038aada81f3a616d8a', - 'condition': 'checkout_src_internal', - }, - 'src/chrome/tools/memory': { 'url': Var('chrome_git') + '/chrome/tools/memory.git' + '@' + '3c9359382236f6d57c91505234a2bc7fd635ba6c', @@ -4157,13 +4452,25 @@ deps = { }, 'src/chrome/services/speech/internal': { - 'url': Var('chrome_git') + '/chromeos/speech.git' + '@' + 'ae04dd0dae0a673d33c29bbe84405932d77e14fc', + 'url': Var('chrome_git') + '/chromeos/speech.git' + '@' + '917c83b7c79126906c5d19668256b9d9139a0e71', 'condition': 'checkout_chromeos and checkout_src_internal', }, + 'src/chrome/updater/internal': { + 'url': Var('chrome_git') + '/chrome/updater/internal.git' + '@' + + '2156fafa6a12ebd5c6388aabf8e149d8e50f5ed5', + 'condition': 'checkout_src_internal', + }, + + 'src/components/accessibility/internal': { + 'url': Var('chrome_git') + '/chrome-accessibility.git' + '@' + + '2e6c405fd5f09ad9d8933bc531af8c5dd24f348c', + 'condition': 'checkout_src_internal', + }, + 'src/components/autofill/core/browser/form_parsing/internal_resources': { 'url': Var('chrome_git') + '/chrome/components/autofill_regex_patterns.git' + '@' + - '8d5b9c6b4200e59297bb32f8cca01d7564eb259b', + 'd74d93ad9bc077c106419510e7aa08fa5d618cf1', 'condition': 'checkout_src_internal', }, @@ -4174,7 +4481,7 @@ deps = { 'src/components/metrics/internal': { 'url': Var('chrome_git') + '/chrome/components/metrics/internal.git' + '@' + - 'ac51808a082f35a97395ebb49c74dca809bd7540', + 'b142ab0612763d64d3ec3b79cd71c6dc9bcbe20b', 'condition': 'checkout_src_internal', }, @@ -4186,25 +4493,31 @@ deps = { 'src/components/optimization_guide/internal': { 'url': Var('chrome_git') + '/chrome/components/optimization_guide.git' + '@' + - '3603f882504d9a8785fc8e3869ccdf4cc7394314', + '53245c50e8faa652c12a9dc5bda2228d22f03f68', + 'condition': 'checkout_src_internal', + }, + + 'src/components/plus_addresses/resources/internal': { + 'url': Var('chrome_git') + '/chrome/components/plus_addresses/resources.git' + '@' + + 'e73efc6aae32e7a580170cf34cbbea6bf1a6b7ce', 'condition': 'checkout_src_internal', }, 'src/components/resources/default_100_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/components/default_100_percent/google_chrome.git' + '@' + - '459263268c478eeb63e788074eb251eabe9bc385', + 'e147db95eb4f7baa20207a513485e019af0e18bb', 'condition': 'checkout_src_internal', }, 'src/components/resources/default_200_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/components/default_200_percent/google_chrome.git' + '@' + - '66e7e3c423b0a795a3706ab63d3e9adfd8c5a646', + '22f067172eb11f6b7191aa1ec1aec38b0045839b', 'condition': 'checkout_src_internal', }, 'src/components/resources/default_300_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/components/default_300_percent/google_chrome.git' + '@' + - '91bb3da51c938685b899b3bd8a5ba0dda86bb861', + 'd01fae2b485ce5571b9d2e9d766cbbda687c21ad', 'condition': 'checkout_src_internal', }, @@ -4214,9 +4527,21 @@ deps = { 'condition': 'checkout_src_internal', }, + 'src/components/test/data/autofill/heuristics-json/internal': { + 'url': Var('chrome_git') + '/chrome/test/autofill/structured_forms.git' + '@' + + '868d3dca11f4ecca239de85e60f46de0b10ad106', + 'condition': 'checkout_chromium_autofill_test_dependencies', + }, + + 'src/components/test/data/autofill/label-doms/internal': { + 'url': Var('chrome_git') + '/chrome/test/autofill/field_labels.git' + '@' + + 'c67083dbb39d4bd87d86c083fecbe35aa562c777', + 'condition': 'checkout_chromium_autofill_test_dependencies', + }, + 'src/components/vector_icons/google_chrome': { 'url': Var('chrome_git') + '/chrome/vector_icons/google_chrome.git' + '@' + - 'dbf059ca9ed5a4da6ae628042a2797e822a53d79', + 'ecad7931572c1f673bf582b785838daadbaadfab', 'condition': 'checkout_src_internal', }, @@ -4228,22 +4553,16 @@ deps = { 'src/google_apis/internal': { 'url': Var('chrome_git') + '/chrome/google_apis/internal.git' + '@' + - '1f0b7eaee8e77a00988d3af8d1647ba9cca9965c', + '7a37593e294ec4baa40e12505722a792940399ff', 'condition': 'checkout_src_internal', }, 'src/ios_internal': { 'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' + - '6a51cc6934837120dc3cd3eab35e745cc8950e8e', + '2d258da4b8b08c065c59c2a42b16a0c29d3484b3', 'condition': 'checkout_ios and checkout_src_internal', }, - 'src/remoting/android/internal': { - 'url': Var('chrome_git') + '/chrome/remoting/android/internal.git' + '@' + - 'd4b268b20d45eeb46d9c7cb2b9d88f921254fdae', - 'condition': 'checkout_android and checkout_src_internal', - }, - 'src/remoting/host/installer/linux/internal': { 'url': Var('chrome_git') + '/chrome/remoting/host/installer/linux/internal.git' + '@' + 'e190816de75b14897f1af785eb37d237750460e2', @@ -4251,8 +4570,8 @@ deps = { }, 'src/remoting/internal': { - 'url': Var('chrome_git') + '/chrome/app-streaming.git' + '@' + - 'd4e99ab2c43b3301e1d3ba88a7cfccd93511c8b0', + 'url': Var('chrome_git') + '/chrome/remoting/internal.git' + '@' + + 'f4b7da7fe40499ad775d1b2a730f4cd1de4ac05c', 'condition': 'checkout_src_internal', }, @@ -4268,54 +4587,132 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/remoting/webapp/app_remoting/internal': { - 'url': Var('chrome_git') + '/chrome/remoting/webapp/app_remoting/internal.git' + '@' + - '5ad5339af97c3bd193d595de03f34282491ce495', - 'condition': 'checkout_src_internal', - }, - 'src/signing_keys': { 'url': Var('chrome_git') + '/clank/apptestkey.git' + '@' + '5138e684915721cbccbb487ec0764ed05650fcd0', 'condition': 'checkout_android and checkout_google_internal and checkout_src_internal', }, - 'src/skia/tools/clusterfuzz-data':{ - 'url': Var('chrome_git') + '/chrome/tools/clusterfuzz-data.git' + '@' + - 'fa1fc4acacddd8d655cfca0bcadef5f7e2259bed', - 'condition': 'checkout_clusterfuzz_data and checkout_src_internal', + 'src/skia/tools/clusterfuzz-data':{ + 'url': Var('chrome_git') + '/chrome/tools/clusterfuzz-data.git' + '@' + + 'fa1fc4acacddd8d655cfca0bcadef5f7e2259bed', + 'condition': 'checkout_clusterfuzz_data and checkout_src_internal', + }, + + 'src/third_party/android_tools_internal': { + 'url': Var('chrome_git') + '/clank/third_party/android_tools.git' + '@' + + 'ab59dfd133386420a319a194c9ac6f5cae802471', + 'condition': 'checkout_android and checkout_src_internal', + }, + + 'src/third_party/libassistant/x64': { + 'packages': [ + { + 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_device/x86_64/internal', + 'version': 'CmuG4T_84hgqYyVPLppHO_cYpXPoYIFpJNT5wC5iGZgC', + }, + ], + 'condition': 'checkout_src_internal and checkout_chromeos', + 'dep_type': 'cipd', + }, + + 'src/third_party/libassistant/arm64': { + 'packages': [ + { + 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_device/arm64/internal', + 'version': '0gwaQvw-4Jne1dvCdVsGRVHcADdvSLBy172ar-FFyIoC', + }, + ], + 'condition': 'checkout_src_internal and checkout_chromeos', + 'dep_type': 'cipd', + }, + + 'src/third_party/libassistant/arm': { + 'packages': [ + { + 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_device/arm/internal', + 'version': 'bLW45XE7O8kCndjxEYtqdupr0tV4mgB7xKkcETBOsskC', + }, + ], + 'condition': 'checkout_src_internal and checkout_chromeos', + 'dep_type': 'cipd', + }, + + 'src/third_party/libassistant/glinux': { + 'packages': [ + { + 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_glinux/x64/internal', + 'version': '3Opw5sw239P8B6hdZCofFV_16gGsW5nJbuoA93doiAkC', + }, + ], + 'condition': 'checkout_src_internal and checkout_chromeos', + 'dep_type': 'cipd', + }, + + 'src/third_party/libassistant/fake_s3_server': { + 'packages': [ + { + 'package': 'chromeos_internal/assistant/libassistant/fake_s3_server_cros_glinux/x64/internal', + 'version': '7BVkGvAvW0XDvbHj3P4-e6TAxssx6_PC2L0eQBLWyP8C', + }, + ], + 'condition': 'checkout_src_internal and checkout_chromeos', + 'dep_type': 'cipd', }, - 'src/third_party/amd': { - 'url': Var('chrome_git') + '/chrome/deps/amd.git' + '@' + - 'cbd9811acb6d09f19b880fdbc6f0fc62901c9a5c', - 'condition': 'checkout_win and checkout_src_internal', + 'src/third_party/screen-ai/linux': { + 'packages': [ + { + 'package': 'chromium/third_party/screen-ai/linux', + 'version': Var('screen_ai_linux'), + }, + ], + 'condition': 'checkout_linux and non_git_source', + 'dep_type': 'cipd', }, - 'src/third_party/android_tools_internal': { - 'url': Var('chrome_git') + '/clank/third_party/android_tools.git' + '@' + - 'ab59dfd133386420a319a194c9ac6f5cae802471', - 'condition': 'checkout_android and checkout_src_internal', + 'src/third_party/screen-ai/macos_amd64': { + 'packages': [ + { + 'package': 'chromium/third_party/screen-ai/mac-amd64', + 'version': Var('screen_ai_macos_amd64'), + }, + ], + 'condition': 'checkout_mac', + 'dep_type': 'cipd', }, - # OpenGL ES 2.0 Conformance tests. - 'src/third_party/gles2_conform': { - 'url': Var('chrome_git') + '/chrome/deps/gles2_conform.git' + '@' + - '57738bb2cc672cb81ed2ee287fcd0defde968811', - 'condition': 'checkout_src_internal', + 'src/third_party/screen-ai/macos_arm64': { + 'packages': [ + { + 'package': 'chromium/third_party/screen-ai/mac-arm64', + 'version': Var('screen_ai_macos_arm64'), + }, + ], + 'condition': 'checkout_mac', + 'dep_type': 'cipd', }, - 'src/third_party/googlemac': { - 'url': Var('chrome_git') + '/chrome/deps/googlemac.git' + '@' + - '6ae4175fcf9e37655c5d7c3a7482dfc7436281d2', - 'condition': 'checkout_mac and checkout_src_internal', + 'src/third_party/screen-ai/windows_amd64': { + 'packages': [ + { + 'package': 'chromium/third_party/screen-ai/windows-amd64', + 'version': Var('screen_ai_windows_amd64'), + }, + ], + 'condition': 'checkout_win', + 'dep_type': 'cipd', }, - # OpenGL ES 3.X Conformance tests. - "src/third_party/khronos_glcts": { - 'url': Var('chrome_git') + '/chrome/deps/khronos_glcts.git' + '@' + - 'eedb0baca9e88c53596874901ff5f6136102d20d', - 'condition': 'checkout_src_internal', + 'src/third_party/screen-ai/windows_386': { + 'packages': [ + { + 'package': 'chromium/third_party/screen-ai/windows-386', + 'version': Var('screen_ai_windows_386'), + }, + ], + 'condition': 'checkout_win', + 'dep_type': 'cipd', }, 'src/third_party/soda': { @@ -4325,7 +4722,7 @@ deps = { 'version': 'StdK8khsivYZXVo2wZuVMnDN_xrVO2a8HV8kvfJ3emwC', }, ], - 'condition': 'checkout_linux and checkout_soda and checkout_src_internal', + 'condition': 'checkout_linux and checkout_soda and checkout_src_internal and non_git_source', 'dep_type': 'cipd', }, @@ -4370,23 +4767,23 @@ deps = { 'src/third_party/widevine/cdm/linux': { 'url': Var('chrome_git') + '/chrome/deps/widevine/cdm/linux.git' + '@' + - 'a491291d608cdb117f2d1e449e8c9b44a0173548', + '8a12afc6ad470fac67ecb97bc9acf4bdbf9285e7', 'condition': 'checkout_linux and checkout_src_internal', }, 'src/third_party/widevine/cdm/mac': { 'url': Var('chrome_git') + '/chrome/deps/widevine/cdm/mac.git' + '@' + - '2796e8b7ae5cb53ffa9711fdca1cd4247a1f3968', + '8c2898cf5e27669beeb7fc432a30f953f2541106', 'condition': 'checkout_mac and checkout_src_internal', }, 'src/third_party/widevine/cdm/win': { 'url': Var('chrome_git') + '/chrome/deps/widevine/cdm/win.git' + '@' + - '4f0b47c1af51699e62344d055b1a6d61f87aec13', + '33d580b25178a85837950972b985f555c6d65fa9', 'condition': 'checkout_win and checkout_src_internal', }, - "src/third_party/widevine/scripts": { + 'src/third_party/widevine/scripts': { 'url': Var('chrome_git') + '/chrome/deps/widevine/scripts.git' + '@' + '6ae793a606aeed0d0f1c6f688117653710137744', 'condition': 'checkout_src_internal', @@ -4453,6 +4850,13 @@ include_rules = [ '+third_party/perfetto/include/perfetto/tracing', '+third_party/perfetto/include/perfetto/test', + # PartitionAlloc is located at `base/allocator/partition_allocator` but + # prefers its own include path: + # `#include "partition_alloc/..."` is prefered to + # `#include "base/allocator/partition_allocator/src/partition_alloc/..."`. + "+partition_alloc", + "-base/allocator/partition_allocator", + # Everybody can use headers generated by tools/generate_library_loader. '+library_loaders', @@ -4466,6 +4870,8 @@ include_rules = [ # //styleguide/c++/c++-features.md. '+third_party/abseil-cpp', '-third_party/abseil-cpp/absl/algorithm/container.h', + '-third_party/abseil-cpp/absl/base/attributes.h', + '-third_party/abseil-cpp/absl/base/no_destructor.h', '-third_party/abseil-cpp/absl/base/nullability.h', '-third_party/abseil-cpp/absl/container', '+third_party/abseil-cpp/absl/container/inlined_vector.h', @@ -4474,6 +4880,7 @@ include_rules = [ '-third_party/abseil-cpp/absl/functional/any_invocable.h', '-third_party/abseil-cpp/absl/functional/bind_front.h', '-third_party/abseil-cpp/absl/functional/function_ref.h', + '-third_party/abseil-cpp/absl/functional/overload.h', '-third_party/abseil-cpp/absl/hash', '-third_party/abseil-cpp/absl/log', '-third_party/abseil-cpp/absl/random', @@ -4481,9 +4888,11 @@ include_rules = [ '-third_party/abseil-cpp/absl/strings', '+third_party/abseil-cpp/absl/strings/ascii.h', '+third_party/abseil-cpp/absl/strings/cord.h', + '+third_party/abseil-cpp/absl/strings/str_format.h', '-third_party/abseil-cpp/absl/synchronization', '-third_party/abseil-cpp/absl/time', '-third_party/abseil-cpp/absl/types/any.h', + '-third_party/abseil-cpp/absl/types/optional.h', '-third_party/abseil-cpp/absl/types/span.h', ] @@ -4552,6 +4961,19 @@ hooks = [ '--disable', ], }, + { + # Ensure we remove any file from disk that is no longer needed (e.g. after + # hooks to native GCS deps migration). + 'name': 'remove_stale_files', + 'pattern': '.', + 'action': [ + 'python3', + 'src/tools/remove_stale_files.py', + 'src/third_party/test_fonts/test_fonts.tar.gz', # Remove after 20240901 + 'src/third_party/node/node_modules.tar.gz', # TODO: Remove after 20241201, see https://crbug.com/351092787 + 'src/third_party/tfhub_models', # TODO: Remove after 20241211 + ], + }, { # Ensure that we don't accidentally reference any .pyc files whose # corresponding .py files have since been deleted. @@ -4588,54 +5010,6 @@ hooks = [ 'sync', '--extract', ], }, - { - 'name': 'sysroot_arm', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_arm', - 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--sysroots-json-path=' + Var('sysroots_json_path'), - '--arch=arm'], - }, - { - 'name': 'sysroot_arm64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_arm64', - 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--sysroots-json-path=' + Var('sysroots_json_path'), - '--arch=arm64'], - }, - { - 'name': 'sysroot_x86', - 'pattern': '.', - 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)', - 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--sysroots-json-path=' + Var('sysroots_json_path'), - '--arch=x86'], - }, - { - 'name': 'sysroot_mips', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_mips', - 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--sysroots-json-path=' + Var('sysroots_json_path'), - '--arch=mips'], - }, - { - 'name': 'sysroot_mips64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_mips64', - 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--sysroots-json-path=' + Var('sysroots_json_path'), - '--arch=mips64el'], - }, - { - 'name': 'sysroot_x64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_x64', - 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--sysroots-json-path=' + Var('sysroots_json_path'), - '--arch=x64'], - }, { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', @@ -4663,68 +5037,17 @@ hooks = [ 'condition': 'checkout_mac or checkout_ios', 'action': ['python3', 'src/build/mac_toolchain.py'], }, - { - # Update the prebuilt clang toolchain. - # Note: On Win, this should run after win_toolchain, as it may use it. - 'name': 'clang', - 'pattern': '.', - 'condition': 'not llvm_force_head_revision', - 'action': ['python3', 'src/tools/clang/scripts/update.py'], - }, - { - # Update prebuilt Rust toolchain. - 'name': 'rust-toolchain', - 'pattern': '.', - 'condition': 'checkout_rust', - 'action': ['python3', 'src/tools/rust/update_rust.py'], - }, { # Build the clang toolchain from tip-of-tree. # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang_tot', 'pattern': '.', 'condition': 'llvm_force_head_revision', - 'action': ['python3', 'src/tools/clang/scripts/build.py', + 'action': ['vpython3', 'src/tools/clang/scripts/build.py', '--llvm-force-head-revision', '--with-android={checkout_android}', '--with-fuchsia={checkout_fuchsia}'], }, - { - # This is supposed to support the same set of platforms as 'clang' above. - 'name': 'clang_coverage', - 'pattern': '.', - 'condition': 'checkout_clang_coverage_tools', - 'action': ['python3', 'src/tools/clang/scripts/update.py', - '--package=coverage_tools'], - }, - { - # This is also supposed to support the same set of platforms as 'clang' - # above. LLVM ToT support isn't provided at the moment. - 'name': 'clang_tidy', - 'pattern': '.', - 'condition': 'checkout_clang_tidy', - 'action': ['python3', 'src/tools/clang/scripts/update.py', - '--package=clang-tidy'], - }, - { - # This is also supposed to support the same set of platforms as 'clang' - # above. LLVM ToT support isn't provided at the moment. - 'name': 'clangd', - 'pattern': '.', - 'condition': 'checkout_clangd', - 'action': ['python3', 'src/tools/clang/scripts/update.py', - '--package=clangd'], - }, - { - # Should run after the clang hook. Used on mac, as well as for orderfile - # generation and size tooling on Android. Used by - # dump-static-initializers.py on linux. - 'name': 'objdump', - 'pattern': '.', - 'condition': 'checkout_linux or checkout_mac or checkout_android and host_os != "mac"', - 'action': ['python3', 'src/tools/clang/scripts/update.py', - '--package=objdump'], - }, { # Update LASTCHANGE. 'name': 'lastchange', @@ -4754,296 +5077,88 @@ hooks = [ # Update dawn_version.h. 'name': 'lastchange_dawn', 'pattern': '.', - 'action': ['python3', 'src/build/util/lastchange.py', - '-s', 'src/third_party/dawn', - '--revision', 'src/gpu/webgpu/DAWN_VERSION'], - }, - # Pull dsymutil binaries using checked-in hashes. - { - 'name': 'dsymutil_mac_arm64', - 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "arm64"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-browser-clang', - '-s', 'src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1', - '-o', 'src/tools/clang/dsymutil/bin/dsymutil', - ], - }, - { - 'name': 'dsymutil_mac_x64', - 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "x64"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-browser-clang', - '-s', 'src/tools/clang/dsymutil/bin/dsymutil.x64.sha1', - '-o', 'src/tools/clang/dsymutil/bin/dsymutil', - ], - }, - - # Pull clang-format binaries using checked-in hashes. - { - 'name': 'clang_format_win', - 'pattern': '.', - 'condition': 'host_os == "win"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/win/clang-format.exe.sha1', - ], - }, - { - 'name': 'clang_format_mac_x64', - 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "x64"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/mac/clang-format.x64.sha1', - '-o', 'src/buildtools/mac/clang-format', - ], - }, - { - 'name': 'clang_format_mac_arm64', - 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "arm64"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/mac/clang-format.arm64.sha1', - '-o', 'src/buildtools/mac/clang-format', - ], - }, - { - 'name': 'clang_format_linux', - 'pattern': '.', - 'condition': 'host_os == "linux"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/linux64/clang-format.sha1', - ], - }, - # Pull rc binaries using checked-in hashes. - { - 'name': 'rc_win', - 'pattern': '.', - 'condition': 'checkout_win and host_os == "win"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-browser-clang/rc', - '-s', 'src/build/toolchain/win/rc/win/rc.exe.sha1', - ], - }, - { - 'name': 'rc_mac', - 'pattern': '.', - 'condition': 'checkout_win and host_os == "mac"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-browser-clang/rc', - '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', - ], - }, - { - 'name': 'rc_linux', - 'pattern': '.', - 'condition': 'checkout_win and host_os == "linux"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-browser-clang/rc', - '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1', - ] - }, - { - 'name': 'test_fonts', - 'pattern': '.', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--extract', - '--no_auth', - '--bucket', 'chromium-fonts', - '-s', 'src/third_party/test_fonts/test_fonts.tar.gz.sha1', - ], - }, - # Download test resources for opus, i.e. audio files. - { - 'name': 'opus_test_files', - 'pattern': '.', - 'action': ['python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_auth', - '--quiet', - '--bucket', 'chromium-webrtc-resources', - '-d', 'src/third_party/opus/tests/resources'], - }, - { - 'name': 'apache_win32', - 'pattern': '\\.sha1', - 'condition': 'checkout_win', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--directory', - '--recursive', - '--no_auth', - '--num_threads=16', - '--bucket', 'chromium-apache-win32', - 'src/third_party/apache-win32', - ], - }, - { - 'name': 'msan_chained_origins_focal', - 'pattern': '.', - 'condition': 'checkout_instrumented_libraries', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-instrumented-libraries', - '-s', 'src/third_party/instrumented_libraries/binaries/msan-chained-origins-focal.tgz.sha1', - ], - }, - { - 'name': 'msan_no_origins_focal', - 'pattern': '.', - 'condition': 'checkout_instrumented_libraries', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-instrumented-libraries', - '-s', 'src/third_party/instrumented_libraries/binaries/msan-no-origins-focal.tgz.sha1', - ], - }, - { - 'name': 'wasm_fuzzer', - 'pattern': '.', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '-u', - '--bucket', 'v8-wasm-fuzzer', - '-s', 'src/v8/test/fuzzer/wasm_corpus.tar.gz.sha1', - ], - }, - # Download selected models from TFHub as testdata. - { - 'name': 'download_tfhub_models', - 'pattern': '.', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--extract', - '--bucket', 'chromium-tfhub-models', - '-s', 'src/third_party/tfhub_models/models.tar.gz.sha1', - ], + 'action': ['python3', 'src/build/util/lastchange.py', + '-s', 'src/third_party/dawn', + '--revision', 'src/gpu/webgpu/DAWN_VERSION'], }, - - # Pull down Node binaries for WebUI toolchain. + # Pull dsymutil binaries using checked-in hashes. { - 'name': 'node_linux64', + 'name': 'dsymutil_mac_arm64', 'pattern': '.', - 'condition': 'host_os == "linux"', + 'condition': 'host_os == "mac" and host_cpu == "arm64"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', - '--extract', '--no_auth', - '--bucket', 'chromium-nodejs/16.13.0', - '-s', 'src/third_party/node/linux/node-linux-x64.tar.gz.sha1', + '--bucket', 'chromium-browser-clang', + '-s', 'src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1', + '-o', 'src/tools/clang/dsymutil/bin/dsymutil', ], }, - # The Mac x64/arm64 binaries are downloaded regardless of host architecture - # since it's possible to cross-compile for the other architecture. This can - # cause problems for tests that use node if the test device architecture does - # not match the architecture of the compile machine. { - 'name': 'node_mac', + 'name': 'dsymutil_mac_x64', 'pattern': '.', - 'condition': 'host_os == "mac"', + 'condition': 'host_os == "mac" and host_cpu == "x64"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', - '--extract', '--no_auth', - '--bucket', 'chromium-nodejs/16.13.0', - '-s', 'src/third_party/node/mac/node-darwin-x64.tar.gz.sha1', + '--bucket', 'chromium-browser-clang', + '-s', 'src/tools/clang/dsymutil/bin/dsymutil.x64.sha1', + '-o', 'src/tools/clang/dsymutil/bin/dsymutil', ], }, + + # Pull rc binaries using checked-in hashes. { - 'name': 'node_mac_arm64', + 'name': 'rc_win', 'pattern': '.', - 'condition': 'host_os == "mac"', + 'condition': 'checkout_win and host_os == "win"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', - '--extract', '--no_auth', - '--bucket', 'chromium-nodejs/16.13.0', - '-s', 'src/third_party/node/mac/node-darwin-arm64.tar.gz.sha1', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/win/rc.exe.sha1', ], }, { - 'name': 'node_win', + 'name': 'rc_mac', 'pattern': '.', - 'condition': 'host_os == "win"', + 'condition': 'checkout_win and host_os == "mac"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', '--no_auth', - '--bucket', 'chromium-nodejs/16.13.0', - '-s', 'src/third_party/node/win/node.exe.sha1', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], }, - - # Pull down NPM dependencies for WebUI toolchain. { - 'name': 'webui_node_modules', + 'name': 'rc_linux', 'pattern': '.', + 'condition': 'checkout_win and host_os == "linux"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', - '--extract', '--no_auth', - '--bucket', 'chromium-nodejs', - '-s', 'src/third_party/node/node_modules.tar.gz.sha1', - ], + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1', + ] }, - - # NPM dependencies for JavaScript code coverage. { - 'name': 'js_coverage_node_modules', - 'condition': 'checkout_js_coverage_modules', - 'pattern': '.', + 'name': 'apache_win32', + 'pattern': '\\.sha1', + 'condition': 'checkout_win', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', - '--extract', + '--directory', + '--recursive', '--no_auth', - '--bucket', 'chromium-nodejs/js_code_coverage', - '-s', 'src/third_party/js_code_coverage/node_modules.tar.gz.sha1', + '--num_threads=16', + '--bucket', 'chromium-apache-win32', + 'src/third_party/apache-win32', ], }, @@ -5103,51 +5218,11 @@ hooks = [ ], }, - # Download test data for Perfetto diff tests - { - 'name': 'perfetto_testdata', - 'condition': 'host_os == "linux"', - 'pattern': '\\.sha256', - 'action': [ 'python3', - 'src/third_party/perfetto/tools/test_data', - '--dir', - 'src/base/tracing/test/data', - 'download', - ], - }, - - # Download test data for Maps telemetry_gpu_integration_test. - { - 'name': 'maps_perf_test_load_dataset', - 'pattern': '\\.sha1', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-telemetry', - '-s', 'src/tools/perf/page_sets/maps_perf_test/load_dataset.sha1', - ], - }, - - # Pull down Zucchini test data. - { - 'name': 'zucchini_testdata', - 'pattern': '.', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--num_threads=4', - '--bucket', 'chromium-binary-patching/zucchini_testdata', - '--recursive', - '-d', 'src/components/zucchini', - ], - }, # Pull down WPR Archive files { 'name': 'Fetch WPR archive files', 'pattern': '.', - 'condition': 'checkout_android and (checkout_wpr_archives or checkout_src_internal)', + 'condition': 'checkout_android and checkout_wpr_archives', 'action': [ 'python3', 'src/chrome/test/data/android/manage_wpr_archives.py', 'download', @@ -5165,7 +5240,7 @@ hooks = [ { 'name': 'Fetch Android AFDO profile', 'pattern': '.', - 'condition': 'checkout_android', + 'condition': 'checkout_android and checkout_pgo_profiles', 'action': [ 'python3', 'src/tools/download_optimization_profile.py', '--newest_state=src/chrome/android/profiles/newest.txt', @@ -5177,7 +5252,7 @@ hooks = [ { 'name': 'Fetch Android Arm AFDO profile', 'pattern': '.', - 'condition': 'checkout_android', + 'condition': 'checkout_android and checkout_pgo_profiles', 'action': [ 'python3', 'src/tools/download_optimization_profile.py', '--newest_state=src/chrome/android/profiles/arm.newest.txt', @@ -5186,59 +5261,6 @@ hooks = [ '--gs_url_base=chromeos-prebuilt/afdo-job/llvm', ], }, - { - 'name': 'gvr_static_shim_android', - 'pattern': '\\.sha1', - 'condition': 'checkout_android', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-gvr-static-shim', - '-d', 'src/third_party/gvr-android-sdk', - ], - }, - { - 'name': 'vr_controller_test_api', - 'pattern': '\\.sha1', - 'condition': 'checkout_android', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-gvr-static-shim/controller_test_api', - '-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1', - ], - }, - { - 'name': 'vr_assets', - 'pattern': '.', - 'condition': 'checkout_android and checkout_src_internal', - 'action': ['python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--bucket', 'chrome-vr-assets', - '--recursive', - '--directory', - 'src/chrome/browser/resources/vr/assets/google_chrome', - ], - }, - # Download and unpack MediaPipe Integration tests. - { - 'name': 'mediapipe_integration_testdata', - 'pattern': '.', - 'action': [ 'python3', - 'src/content/test/gpu/gpu_tests/mediapipe_update.py', - ], - }, - # Download VR test APKs only if the environment variable is set - { - 'name': 'vr_test_apks', - 'pattern': '.', - 'condition': 'checkout_android', - 'action': [ 'python3', - 'src/third_party/gvr-android-sdk/test-apks/update.py', - ], - }, # DOWNLOAD AR test APKs only if the environment variable is set { 'name': 'ar_test_apks', @@ -5248,17 +5270,6 @@ hooks = [ 'src/third_party/arcore-android-sdk/test-apks/update.py', ], }, - { - 'name': 'subresource-filter-ruleset', - 'pattern': '.', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-ads-detection', - '-s', 'src/third_party/subresource-filter-ruleset/data/UnindexedRules.sha1', - ], - }, # Download AFDO profiles for ChromeOS for each architecture. { 'name': 'Fetch ChromeOS AFDO profiles (from Intel Atom cores)', @@ -5297,31 +5308,9 @@ hooks = [ ], }, { - 'name': 'Fetch ChromeOS AFDO profiles (experimental Arm profile)', - 'pattern': '.', - 'condition': 'checkout_chromeos or checkout_simplechrome', - 'action': [ 'python3', - 'src/tools/download_optimization_profile.py', - '--newest_state=src/chromeos/profiles/arm-exp.afdo.newest.txt', - '--local_state=src/chromeos/profiles/arm-exp.afdo.local.txt', - '--output_name=src/chromeos/profiles/arm-exp.afdo.prof', - '--gs_url_base=chromeos-prebuilt/afdo-job/vetted/release', - ], - }, - { - # Pull doclava binaries if building for Android. - 'name': 'doclava', - 'pattern': '.', - 'condition': 'checkout_android', - 'action': [ 'python3', - 'src/build/android/download_doclava.py', - ], - }, - - { - 'name': 'Download Fuchsia SDK from GCS', + 'name': 'Download Fuchsia SDK', 'pattern': '.', - 'condition': 'checkout_fuchsia', + 'condition': 'checkout_fuchsia and not checkout_fuchsia_no_hooks', 'action': [ 'python3', 'src/build/fuchsia/update_sdk.py', @@ -5346,11 +5335,18 @@ hooks = [ 'pattern': '.', 'condition': 'checkout_fuchsia_internal and checkout_src_internal', 'action': ['python3', - 'src/build/fuchsia/update_images.py', - '--default-bucket', 'fuchsia-sdk', - '--image-root-dir', - 'src/third_party/fuchsia-sdk/images-internal', - '--boot-images', '{checkout_fuchsia_internal_images}' + 'src/build/fuchsia/update_product_bundles.py', + '{checkout_fuchsia_internal_images}', + '--internal'], + }, + + { + 'name': 'Create Fuchsia GN sdk build rules when not running update_sdk.py', + 'pattern': '.', + 'condition': 'checkout_fuchsia_no_hooks', + 'action': [ + 'python3', + 'src/build/fuchsia/gen_build_defs.py', ], }, @@ -5363,7 +5359,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--nogoma', + '--no-use-remoteexec', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5382,7 +5378,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--nogoma', + '--no-use-remoteexec', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5400,7 +5396,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--nogoma', + '--no-use-remoteexec', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5417,7 +5413,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--nogoma', + '--no-use-remoteexec', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5426,86 +5422,6 @@ hooks = [ '--download-vm', ], }, - # Download Lacros's version of the simplechrome sdks. VMs are disregarded - # because this version of sdk is only used for compiling Lacros. - { - 'name': 'cros_simplechrome_artifacts_with_vm for lacros', - 'pattern': '.', - 'condition': 'checkout_simplechrome_with_vms and not checkout_src_internal and checkout_lacros_sdk', - 'action': [ - 'vpython3', - 'src/third_party/chromite/bin/cros', - 'chrome-sdk', - '--fallback-versions=20', - '--nogoma', - '--nogn-gen', - '--no-shell', - '--log-level=warning', - '--cache-dir=src/build/cros_cache/', - '--use-external-config', - '--boards={cros_boards_with_qemu_images}', - '--is-lacros', - '--version={lacros_sdk_version}', - ], - }, - { - 'name': 'cros_simplechrome_artifacts_with_no_vm for lacros', - 'pattern': '.', - 'condition': 'checkout_simplechrome and not checkout_src_internal and checkout_lacros_sdk', - 'action': [ - 'vpython3', - 'src/third_party/chromite/bin/cros', - 'chrome-sdk', - '--fallback-versions=20', - '--nogoma', - '--nogn-gen', - '--no-shell', - '--log-level=warning', - '--cache-dir=src/build/cros_cache/', - '--use-external-config', - '--boards={cros_boards}', - '--is-lacros', - '--version={lacros_sdk_version}', - ], - }, - { - 'name': 'cros_simplechrome_artifacts_with_vm_internal for lacros', - 'pattern': '.', - 'condition': 'checkout_simplechrome_with_vms and checkout_src_internal and checkout_lacros_sdk', - 'action': [ - 'vpython3', - 'src/third_party/chromite/bin/cros', - 'chrome-sdk', - '--fallback-versions=20', - '--nogoma', - '--nogn-gen', - '--no-shell', - '--log-level=warning', - '--cache-dir=src/build/cros_cache/', - '--boards={cros_boards_with_qemu_images}', - '--is-lacros', - '--version={lacros_sdk_version}', - ], - }, - { - 'name': 'cros_simplechrome_artifacts_with_no_vm_internal for lacros', - 'pattern': '.', - 'condition': 'checkout_simplechrome and checkout_src_internal and checkout_lacros_sdk', - 'action': [ - 'vpython3', - 'src/third_party/chromite/bin/cros', - 'chrome-sdk', - '--fallback-versions=20', - '--nogoma', - '--nogn-gen', - '--no-shell', - '--log-level=warning', - '--cache-dir=src/build/cros_cache/', - '--boards={cros_boards}', - '--is-lacros', - '--version={lacros_sdk_version}', - ], - }, # Download PGO profiles. { @@ -5574,39 +5490,6 @@ hooks = [ '--gs-url-base=chromium-optimization-profiles/pgo_profiles', ], }, - { - 'name': 'Fetch PGO profiles for lacros amd64', - 'pattern': '.', - 'condition': 'checkout_pgo_profiles and checkout_lacros_sdk', - 'action': [ 'python3', - 'src/tools/update_pgo_profiles.py', - '--target=lacros64', - 'update', - '--gs-url-base=chromium-optimization-profiles/pgo_profiles', - ], - }, - { - 'name': 'Fetch PGO profiles for lacros arm', - 'pattern': '.', - 'condition': 'checkout_pgo_profiles and checkout_lacros_sdk', - 'action': [ 'python3', - 'src/tools/update_pgo_profiles.py', - '--target=lacros-arm', - 'update', - '--gs-url-base=chromium-optimization-profiles/pgo_profiles', - ], - }, - { - 'name': 'Fetch PGO profiles for lacros arm64', - 'pattern': '.', - 'condition': 'checkout_pgo_profiles and checkout_lacros_sdk', - 'action': [ 'python3', - 'src/tools/update_pgo_profiles.py', - '--target=lacros-arm64', - 'update', - '--gs-url-base=chromium-optimization-profiles/pgo_profiles', - ], - }, { 'name': 'Fetch PGO profiles for android arm32', 'pattern': '.', @@ -5634,12 +5517,14 @@ hooks = [ 'pattern': '.', # Always download profiles on Android builds. The GN arg `is_official_build` # is required to consider the profiles during build time. - 'condition': 'checkout_pgo_profiles or checkout_android', + 'condition': 'checkout_pgo_profiles', 'action': [ 'python3', 'src/v8/tools/builtins-pgo/download_profiles.py', 'download', '--depot-tools', 'src/third_party/depot_tools', + '--check-v8-revision', + '--quiet', ], }, @@ -5666,32 +5551,42 @@ hooks = [ 'condition': 'generate_location_tags', }, + # Configure remote exec cfg files { - # Clean up build dirs for crbug.com/1337238. - # After a libc++ roll and revert, .ninja_deps would get into a state - # that breaks Ninja on Windows. - # TODO(crbug.com/1409337): Remove this after updating Ninja 1.12 or newer. - 'name': 'del_ninja_deps_cache', + # Use luci_auth if on windows and using chrome-untrusted project + 'name': 'download_and_configure_reclient_cfgs', 'pattern': '.', - 'condition': 'host_os == "win"', - 'action': ['python3', 'src/build/del_ninja_deps_cache.py'], - }, - # Download test resources for the style perftest. - { - 'name': 'style_perftest_files', + 'condition': 'download_remoteexec_cfg and host_os == "win"', + 'action': ['python3', + 'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py', + '--rbe_instance', + Var('rbe_instance'), + '--reproxy_cfg_template', + 'reproxy.cfg.template', + '--rewrapper_cfg_project', + Var('rewrapper_cfg_project'), + '--use_luci_auth_credshelper', + '--quiet', + ], + }, { + 'name': 'download_and_configure_reclient_cfgs', 'pattern': '.', + 'condition': 'download_remoteexec_cfg and not host_os == "win"', 'action': ['python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_auth', + 'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py', + '--rbe_instance', + Var('rbe_instance'), + '--reproxy_cfg_template', + 'reproxy.cfg.template', + '--rewrapper_cfg_project', + Var('rewrapper_cfg_project'), '--quiet', - '--bucket', 'chromium-style-perftest', - '-d', 'src/third_party/blink/renderer/core/css/perftest_data'], + ], }, - # Configure remote exec cfg files { 'name': 'configure_reclient_cfgs', 'pattern': '.', - 'condition': 'download_remoteexec_cfg', + 'condition': 'not download_remoteexec_cfg', 'action': ['python3', 'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py', '--rbe_instance', @@ -5700,6 +5595,7 @@ hooks = [ 'reproxy.cfg.template', '--rewrapper_cfg_project', Var('rewrapper_cfg_project'), + '--skip_remoteexec_cfg_fetch', '--quiet', ], }, @@ -5725,6 +5621,18 @@ hooks = [ 'gs://aom-test-data', 'src/third_party/libaom/testdata'] }, + { + 'name': 'libvpx_testdata', + 'pattern': '.', + 'condition': 'download_libvpx_testdata', + 'action': ['python3', + 'src/third_party/depot_tools/gsutil.py', + '-q', + '-m', + 'rsync', + 'gs://downloads.webmproject.org/test_data/libvpx', + 'src/third_party/libvpx/testdata'], + }, ] # Add any corresponding DEPS files from this list to chromium.exclusions in @@ -5736,14 +5644,12 @@ recursedeps = [ # Dawn manages DEPS for its copy of the WebGPU CTS as well as GLFW for which # it has build files. 'src/third_party/dawn', - 'src/third_party/devtools-frontend-internal', + 'src/third_party/instrumented_libs', 'src/third_party/openscreen/src', - 'src/third_party/vulkan-deps', + 'src/third_party/devtools-frontend/src', # clank has its own DEPS file, does not need to be in trybot_analyze_config # since the roller does not run tests. 'src/clank', - 'src/chromeos/assistant/internal', - 'src/chrome/chrome_cleaner/internal', 'src/components/optimization_guide/internal', 'src/ios_internal', ] diff --git a/cloudbuild.yaml b/cloudbuild.yaml index fe8887d3963348..eb13942a19b4e6 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -125,27 +125,9 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' - id: 'verify-files' - waitFor: ['configure-build'] - entrypoint: 'bash' - args: - - '-c' - - | - set -e - echo "Listing all files in /workspace/hopium/src:" - ls -R /workspace/hopium/src - echo "---" - echo "Attempting to find pre_rebrand.py recursively (for debugging):" - find /workspace/hopium/src -name 'pre_rebrand.py' -ls || echo "pre_rebrand.py not found anywhere in /workspace/hopium/src" - echo "---" - echo "Checking specifically for the required file at the expected location:" - ls -lh /workspace/hopium/src/hopium/tsec_branding/pre_rebrand.py - echo "Verification step completed." - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' id: 'branding-script' - waitFor: [ 'verify-files' ] + waitFor: [ 'configure-build' ] entrypoint: 'bash' args: - '-c' From fe364ab68deb854ccc2a2c71aea4006c3e978270 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 16 Apr 2025 10:03:00 +0100 Subject: [PATCH 34/68] updated DEPs to use git@ url for protected repos --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index b3ab838cad64a0..33aedc17c24c4c 100644 --- a/DEPS +++ b/DEPS @@ -276,7 +276,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', 'swiftshader_git': 'https://swiftshader.googlesource.com', 'webrtc_git': 'https://webrtc.googlesource.com', - 'hopium_git': 'https://github.com/protectednet', + 'hopium_git': 'git@github.com:protectednet', 'betocore_git': 'https://beto-core.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 From d407ca0808b30e6257acb904dec940903d2f4f7a Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 16 Apr 2025 11:56:42 +0100 Subject: [PATCH 35/68] remove legacy remove_stale_files deps --- DEPS | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/DEPS b/DEPS index 33aedc17c24c4c..97874806a104af 100644 --- a/DEPS +++ b/DEPS @@ -4961,19 +4961,6 @@ hooks = [ '--disable', ], }, - { - # Ensure we remove any file from disk that is no longer needed (e.g. after - # hooks to native GCS deps migration). - 'name': 'remove_stale_files', - 'pattern': '.', - 'action': [ - 'python3', - 'src/tools/remove_stale_files.py', - 'src/third_party/test_fonts/test_fonts.tar.gz', # Remove after 20240901 - 'src/third_party/node/node_modules.tar.gz', # TODO: Remove after 20241201, see https://crbug.com/351092787 - 'src/third_party/tfhub_models', # TODO: Remove after 20241211 - ], - }, { # Ensure that we don't accidentally reference any .pyc files whose # corresponding .py files have since been deleted. From ee07a1da264e57768f627fbaa58c0e347e326aa2 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 16 Apr 2025 12:55:29 +0100 Subject: [PATCH 36/68] remove unsupported skip_remoteexec_cfg_fetch arg for configure_reclient_cfgs --- DEPS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEPS b/DEPS index 97874806a104af..b17c885400c366 100644 --- a/DEPS +++ b/DEPS @@ -5582,7 +5582,6 @@ hooks = [ 'reproxy.cfg.template', '--rewrapper_cfg_project', Var('rewrapper_cfg_project'), - '--skip_remoteexec_cfg_fetch', '--quiet', ], }, From fd3b1a3524586f16624fcc6c177cc5e75a6f6722 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 16 Apr 2025 14:06:47 +0100 Subject: [PATCH 37/68] revert deps and try build with just themissing tsec hopium deps pulled in --- DEPS | 4461 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 2295 insertions(+), 2166 deletions(-) diff --git a/DEPS b/DEPS index b17c885400c366..78be838c464de9 100644 --- a/DEPS +++ b/DEPS @@ -17,7 +17,7 @@ # # # Create and switch to a new branch # git new-branch depsroll -# # Run roll-dep (provided by depot_tools) giving the dep's path and +# # Run roll-dep (provided by depot_tools) giving the dep's path and optionally # # a regex that will match the line in this file that contains the current # # revision. The script ALWAYS rolls the dependency to the latest revision # # in origin/master. The path for the dep should start with src/. @@ -32,21 +32,18 @@ # which is a bit incomplete but the best documentation we have at the # moment. -# We expect all git dependencies specified in this file to be in sync with git -# submodules (gitlinks). -git_dependencies = 'SYNC' - gclient_gn_args_file = 'src/build/config/gclient_args.gni' gclient_gn_args = [ 'build_with_hopium', 'build_with_chromium', 'checkout_android', 'checkout_android_prebuilts_build_tools', + 'checkout_android_native_support', 'checkout_clang_coverage_tools', - 'checkout_copybara', 'checkout_ios_webkit', 'checkout_nacl', 'checkout_openxr', + 'checkout_rts_model', 'checkout_src_internal', 'cros_boards', 'cros_boards_with_qemu_images', @@ -72,12 +69,12 @@ vars = { # By default, don't check out android. Will be overridden by gclient # variables. - # TODO(crbug.com/875037): Remove this once the problem in gclient is fixed. + # TODO(ehmaldonado): Remove this once the bug in gclient is fixed. 'checkout_android': False, # By default, don't check out Fuchsia. Will be overridden by gclient # variables. - # TODO(crbug.com/875037): Remove this once the problem in gclient is fixed. + # TODO(ehmaldonado): Remove this once the bug in gclient is fixed. 'checkout_fuchsia': False, # For code related to internal Fuchsia images. @@ -93,9 +90,17 @@ vars = { # Pull in Android prebuilts build tools so we can create Java xrefs 'checkout_android_prebuilts_build_tools': False, + # Pull in Android native toolchain dependencies for Chrome OS too, so we can + # build ARC++ support libraries. + 'checkout_android_native_support': 'checkout_android or checkout_chromeos', + # By default, do not check out Cast3P. 'checkout_cast3p': False, + # Check out all Chrome Cleaner deps. Set on the Chrome Cleaner builders. + # Requires access to partner-code.googlesource.com. + 'checkout_chrome_cleaner_internal': False, + # By default, do not check out Chromium autofill captured sites test # dependencies. These dependencies include very large numbers of very # large web capture files. Captured sites test dependencies are also @@ -116,18 +121,14 @@ vars = { # output. 'checkout_js_coverage_modules': True, - # Check out and download nacl for ChromeOS only. + # Check out and download nacl by default, unless on an arm mac. # This can be disabled e.g. with custom_vars. - 'checkout_nacl': 'checkout_chromeos', + 'checkout_nacl': 'not (host_os == "mac" and host_cpu == "arm64")', # By default, do not check out src-internal. This can be overridden e.g. with # custom_vars. 'checkout_src_internal': False, - # Condition used by a subset of official Chrome release builders. - # By default, do not check out release_scripts. - 'checkout_chrome_release_scripts': False, - # Checkout legacy src_internal. This variable is ignored if # checkout_src_internal is set as false. 'checkout_legacy_src_internal': True, @@ -161,6 +162,19 @@ vars = { # Fetch clangd into the same bin/ directory as our clang binary. 'checkout_clangd': False, + # Fetch prebuilt and prepackaged Bazel binary/executable. Bazel is currently + # only needed by `chromium/src/tools/rust/build_crubit.py` and therefore + # shouldn't be used outside of Chromium Rust Experiments project. + # Furthermore note that Bazel is only needed when building Crubit during Rust + # toolchain build (and is *not* needed during regular Chromium builds). + 'checkout_bazel': False, + + # Fetch Crubit support libraries in order to build ..._rs_api.rs and + # ..._rs_api_impl.cc that are generated by prebuilt (see + # tools/rust/build_crubit.py) Crubit tools during Chromium build (see + # also //build/rust/rs_bindings_from_cc.gni). + 'checkout_crubit': False, + # By default checkout the OpenXR loader library only on Windows and Android. # The OpenXR backend for VR in Chromium is currently only supported for these # platforms, but support for other platforms may be added in the future. @@ -183,7 +197,7 @@ vars = { # Available images: # Emulation: # - core.x64-dfv2 - # - terminal.x64 + # - terminal.qemu-x64 # - terminal.qemu-arm64 # - workstation.qemu-x64 # Hardware: @@ -193,13 +207,19 @@ vars = { # Since the images are hundreds of MB, default to only downloading the image # most commonly useful for developers. Bots and developers that need to use # other images can override this with additional images. - 'checkout_fuchsia_boot_images': "terminal.x64", + 'checkout_fuchsia_boot_images': "terminal.qemu-x64", 'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""', # By default, do not check out files required to run fuchsia tests in # qemu on linux-arm64 machines. 'checkout_fuchsia_for_arm64_host': False, + # Revision of Crubit (trunk on 2022-10-15). This should typically be the + # same as the revision specified in CRUBIT_REVISION in + # tools/rust/update_rust.py. More details and roll instructions can be + # found in tools/rust/README.md. + 'crubit_revision': 'f5cbdf4b54b0e6b9f63a4464a2c901c82e0f0209', + # By default, download the fuchsia sdk from the public sdk directory. 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/', @@ -214,6 +234,20 @@ vars = { 'checkout_simplechrome': '"{cros_boards}" != ""', 'checkout_simplechrome_with_vms': '"{cros_boards_with_qemu_images}" != ""', + # By default, do not check out versions of toolschains and sdks that are + # specifically only needed by Lacros. + 'checkout_lacros_sdk': False, + # To update the sdk version: + # 1 Choose a version that's not newer than the Ash side so it's thoroughly + # tested: + # https://chromium-review.googlesource.com/q/%2522Automated+Commit:+LKGM%2522+status:merged + # 2 CL description: + # Lacros SDK: Update version + # + # CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-amd64-generic-chrome-skylab + # CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-arm-generic-chrome-skylab + 'lacros_sdk_version': '15580.0.0', + # Generate location tag metadata to include in tests result data uploaded # to ResultDB. This isn't needed on some configs and the tool that generates # the data may not run on them, so we make it possible for this to be @@ -221,19 +255,25 @@ vars = { # via a GN build arg (tests_have_location_tags). 'generate_location_tags': True, - # By default, do not check out Copybara 3pp dependency that is specifically - # needed by Cronet gn2bp CI builder. - 'checkout_copybara': False, - # luci-go CIPD package version. # Make sure the revision is uploaded by infra-packagers builder. # https://ci.chromium.org/p/infra-internal/g/infra-packagers/console - 'luci_go': 'git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956', + 'luci_go': 'git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66', # This can be overridden, e.g. with custom_vars, to build clang from HEAD # instead of downloading the prebuilt pinned revision. 'llvm_force_head_revision': False, + # Fetch Rust toolchain. + 'checkout_rust': True, + + # See //docs/testing/regression-test-selection.md + # for info on RTS + 'checkout_rts_model': False, + + # Use the experimental version of the RTS model + 'checkout_rts_experimental_model': False, + # Make Dawn skip its standalone dependencies 'dawn_standalone': False, @@ -247,24 +287,18 @@ vars = { # reclient CIPD package 'reclient_package': 'infra/rbe/client/', # reclient CIPD package version - 'reclient_version': 're_client_version:0.174.0.d516e7c7-gomaip', + 'reclient_version': 're_client_version:0.113.0.8b45b89-gomaip', - # screen-ai CIPD packages - 'screen_ai_linux': 'version:127.9', - 'screen_ai_macos_amd64': 'version:127.9', - 'screen_ai_macos_arm64': 'version:127.9', - 'screen_ai_windows_amd64': 'version:127.9', - 'screen_ai_windows_386': 'version:127.9', + # The path of the sysroots.json file. + # This is used by vendor builds like Electron. + 'sysroots_json_path': 'build/linux/sysroot_scripts/sysroots.json', # siso CIPD package version. - 'siso_version': 'git_revision:0721be7440a7c67f8369fcce1ca01932638641bb', + 'siso_version': 'git_revision:07d585d17bdd3c521080e2aa5f7b9f6a12f18ded', # download libaom test data 'download_libaom_testdata': False, - # download libvpx test data - 'download_libvpx_testdata': False, - 'android_git': 'https://android.googlesource.com', 'aomedia_git': 'https://aomedia.googlesource.com', 'boringssl_git': 'https://boringssl.googlesource.com', @@ -281,35 +315,38 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'src_internal_revision': '014be7b57c088d653120c5997fea33b52107a768', + 'src_internal_revision': '4e1a09949fa7f234d5fb696f9c4b7de702815e1f', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'b9b67f9b36dab35a507db53e33f4a485cafcd384', + 'skia_revision': 'd0c369eaa6373b5239ea56e71f51ecd319665af2', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '4bd0d4731ea90ff9460eeb6d5cfc6cc1127363d3', + 'v8_revision': '569c6b1c96ec2f6d4b23a103200d2ea09e93617b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '51c42f178dc95a587cf0d9718f8ed401f414b4f2', + 'angle_revision': '0ef565c50e043c90721aa681760b6ef002e04c88', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. - 'swiftshader_revision': 'b99f866d5a5cbbbfc185bce80edfab11c1fad6aa', + 'swiftshader_revision': '97bdc453fbedee92ed0fc7687544098efc821622', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': 'f6da7d235728aeaff6586d2190badfb4290a9979', + 'pdfium_revision': '7952b46ddd1db647dc618b5caf890706ec3bd6d7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': 'd4b6eb542d4fd109baacd550935efd00c521e674', + # + # Note this revision should be updated with + # third_party/boringssl/roll_boringssl.py, not roll-dep. + 'boringssl_revision': 'b8e012e1ff736cc794273af4a7db521e6b18bcd5', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. - 'fuchsia_version': 'version:26.20250117.5.1', + 'fuchsia_version': 'version:14.20230818.1.3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. @@ -317,7 +354,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling googletest # and whatever else without interference from each other. - 'googletest_revision': '2b6b042a77446ff322cd7522ca068d9f2a21c1d1', + 'googletest_revision': 'af29db7ec28d6df1c7f0f745186884091e602e07', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lighttpd # and whatever else without interference from each other. @@ -329,23 +366,23 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling NaCl # and whatever else without interference from each other. - 'nacl_revision': '6944e6b79dbd1b9776681c025bd4f4c281bb4791', + 'nacl_revision': 'f9cb132c419b9e019853103e88c518026b9f5083', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_revision': 'a059b237bb01eb3e4f9f8b1618dda8c117498bab', + 'freetype_revision': '97251fd5aa2a90041cf4f397a5e887b8d60ab0c2', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_testing_revision': '04fa94191645af39750f5eff0a66c49c5cb2c2cc', + 'freetype_testing_revision': '7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling HarfBuzz # and whatever else without interference from each other. - 'harfbuzz_revision': '1c249be96e27eafd15eb86d832b67fbc3751634b', + 'harfbuzz_revision': 'db700b5670d9475cc8ed4880cc9447b232c5e432', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Emoji Segmenter # and whatever else without interference from each other. - 'emoji_segmenter_revision': '955936be8b391e00835257059607d7c5b72ce744', + 'emoji_segmenter_revision': '9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling OTS # and whatever else without interference from each other. @@ -353,31 +390,27 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': 'b15611f18b506cf9dbc03e9bf87dbc8df549ccce', + 'catapult_revision': '00c92993e3e33f83a1e43eaee5d05d111c64632d', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling chromium_variations # and whatever else without interference from each other. - 'chromium_variations_revision': 'd66e3e79647b84e230bec45ffea13c456f4c01e3', + 'chromium_variations_revision': 'f6cad8e6a52ea2febc08d7c29ec701ee0b4fb7ed', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling CrossBench # and whatever else without interference from each other. - 'crossbench_revision': 'ff0961f089effcbad9db2bc733812bb2ffb1a9e6', + 'crossbench_revision': '06981428c28d66678ebec13ca1fac3785cf51bb1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. - 'libfuzzer_revision': 'e31b99917861f891308269c36a32363b120126bb', + 'libfuzzer_revision': '26cc39e59b2bf5cbc20486296248a842c536878d', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling fuzztest # and whatever else without interference from each other. - 'fuzztest_revision': '00edfa0dd94d7e00a89684e950015c30d3b7ae07', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling domato - # and whatever else without interference from each other. - 'domato_revision': '053714bccbda79cf76dac3fee48ab2b27f21925e', + 'fuzztest_revision': 'c9bedad82d1a01341451a5343c860944ee21361b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': 'c6bb3b2ce900d42eefac9c72600ea69e74d40943', + 'devtools_frontend_revision': '5111ff483c1e4e585a4e9d91f23928a209484d4b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -385,75 +418,67 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_build-tools_version # and whatever else without interference from each other. - 'android_sdk_build-tools_version': 'DxwAZ3hD551Neu6ycuW5CPnXFrdleRBd93oX1eB_m9YC', + 'android_sdk_build-tools_version': 'YK9Rzw3fDzMHVzatNN6VlyoD_81amLZpN1AbmkdOd6AC', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_emulator_version # and whatever else without interference from each other. 'android_sdk_emulator_version': '9lGp8nTUCRRWGMnI_96HcKfzjnxEJKUcfvfwmA3wXNkC', # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling android_sdk_extras_version + # and whatever else without interference from each other. + 'android_sdk_extras_version': 'ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling android_sdk_patcher_version + # and whatever else without interference from each other. + 'android_sdk_patcher_version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C', + # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_platform-tools_version # and whatever else without interference from each other. - 'android_sdk_platform-tools_version': 'WihaseZR6cojZbkzIqwGhpTp92ztaGfqq8njBU8eTXYC', + 'android_sdk_platform-tools_version': 'HWVsGs2HCKgSVv41FsOcsfJbNcB0UFiNrF6Tc4yRArYC', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_platforms_version # and whatever else without interference from each other. - 'android_sdk_platforms_version': 'kIXA-9XuCfOESodXEdOBkW5f1ytrGWdbp3HFp1I8A_0C', + 'android_sdk_platforms_preview_version': 'YWMYkzyxGBgVsty0GhXL1oxbY0pGXQIgFc0Rh7ZMRPYC', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling feed + # the commit queue can handle CLs rolling android_sdk_platforms_version # and whatever else without interference from each other. - 'dawn_revision': '4585c9495dd4c1958890921fa2abacd8546d088d', + 'android_sdk_platforms_version': 'u-bhWbTME6u-DjypTgr3ZikCyeAeU6txkR9ET6Uudc8C', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling feed + # the commit queue can handle CLs rolling android_sdk_sources_version # and whatever else without interference from each other. - 'quiche_revision': '16535679768274d3061f1b991082a6a0c8fd1aac', + 'android_sdk_sources_version': '_a_BcnANjPYw5mSKlNHa7GFY8yc1kdqj2rmQgac7yUcC', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling ink + # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'ink_revision': 'e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8', + 'dawn_revision': '092f3f12f369fe3d894f17bca1e9ed40a98bf3f5', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling ink_stroke_modeler + # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'ink_stroke_modeler_revision': '0999e4cf816b42c770d07916698bce943b873048', + 'quiche_revision': 'ba658fc677a78c2515fd1851526be5bea8fc74c4', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ios_webkit # and whatever else without interference from each other. - 'ios_webkit_revision': 'f8c0fe750d94b7db23d193c0b1f31858c2537620', + 'ios_webkit_revision': '59e9de61b7b36507836fa8b098e8839d7d995b13', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libexpat # and whatever else without interference from each other. - 'libexpat_revision': '624da0f593bb8d7e146b9f42b06d8e6c80d032a3', + 'libexpat_revision': '441f98d02deafd9b090aea568282b28f66a50e36', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling wuffs # and whatever else without interference from each other. - 'wuffs_revision': 'e3f919ccfe3ef542cfc983a82146070258fb57f8', + 'wuffs_revision': 'fe9d08f2b6e80af691bfb1a718e144c49a1b9eba', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libavif # and whatever else without interference from each other. - 'libavif_revision': 'e7b34a1f5e9f7024d08311c7bae156061b889882', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling crabbyavif - # and whatever else without interference from each other. - 'crabbyavif_revision': 'f2e7def8ec44946b499ff403904c4b869512d2aa', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling Speedometer v3.0 - # and whatever else without interference from each other. - 'speedometer_main_revision': 'd6b5ffea959ad31e231c203d7446bf8b39e987ce', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling Speedometer v3.0 - # and whatever else without interference from each other. - 'speedometer_3.0_revision': '8d67f28d0281ac4330f283495b7f48286654ad7d', + 'libavif_revision': '676aded3501ff453c88a6d9ed1e5b4f33b458f3e', # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling Speedometer v2.0 - # and whatever else without interference from each other. - 'speedometer_2.0_revision': '732af0dfe867f8815e662ac637357e55f285dbbb', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling Speedometer v2.1 + # the commit queue can handle CLs rolling libavif # and whatever else without interference from each other. - 'speedometer_2.1_revision': '8bf7946e39e47c875c00767177197aea5727e84a', + 'libavifinfo_revision': '707919b2f8ac1920b2f7ae252c233f9c6dcf84e1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling nearby # and whatever else without interference from each other. - 'nearby_revision': '07db16d351c2bed4d921190ba50b57cc6e7fb2d7', + 'nearby_revision': 'ea7aa00e0cd99a0fab900ae55e727fd5acf672fd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling securemessage # and whatever else without interference from each other. @@ -465,7 +490,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'cros_components_revision': '59dd6e3d06e111c6a3d323a92e6478b9bbf15915', + 'cros_components_revision': '043aec14671f160b9bf567749946068ef3603fa1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -473,59 +498,39 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libcxxabi_revision': '8205ccf0f23545ebcd8846363ea1d29e77917a22', + 'libcxxabi_revision': '6a8358a1423aa37f33d87b300b634c067b2741c1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libunwind_revision': 'e55d8cf51c6db1fdd4bb56c158945ec59772c8ee', + 'libunwind_revision': 'd92e619eaa12123a2c235f81c8b0399aafe49ddf', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2', + 'clang_format_revision': 'e5337933f2951cacd3aeacd238ce4578163ca0b9', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'highway_revision': '00fe003dac355b979f36157f9407c7c46448958e', + 'highway_revision': '8f20644eca693cfb74aa795b0006b6779c370e7a', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ffmpeg # and whatever else without interference from each other. - 'ffmpeg_revision': 'd10a0f8bf5ddcce572df95105152bc74041cae0c', + 'ffmpeg_revision': '0ba37733400593b162e5ae9ff26b384cff49c250', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling beto-core # and whatever else without interference from each other. - 'betocore_revision': '89563fec14c756482afa08b016eeba9087c8d1e3', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling tsproxy - # and whatever else without interference from each other. - 'webpagereplay_revision': 'd812e180206934eb3b7ae411d82d61bc21c22f70', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling llvm-libc - # and whatever else without interference from each other. - 'llvm_libc_revision': '12809bfa855813dcef51871e2ee3155e53ed35ea', + 'betocore_revision': 'b902b346037ea3f4aadf8177021f6f917b16e648', # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '2e25154d49c29fa9aa42c30ad4a027bd30123434', + 'libcxx_revision': '84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80', # GN CIPD package version. - 'gn_version': 'git_revision:ed1abc107815210dc66ec439542bee2f6cbabc00', - - # ninja CIPD package. - 'ninja_package': 'infra/3pp/tools/ninja/', + 'gn_version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', # ninja CIPD package version. # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja - 'ninja_version': 'version:3@1.12.1.chromium.4', - - # 'magic' variable to tell depot_tools that git submodules should be accepted - # but parity with DEPS file is expected. - 'SUBMODULE_MIGRATION': 'True', - - # condition to allowlist deps to be synced in Cider. Allowlisting is needed - # because not all deps are compatible with Cider. Once we migrate everything - # to be compatible we can get rid of this allowlisting mecahnism and remove - # this condition. Tracking bug for removing this condition: b/349365433 - 'non_git_source': 'True', + # This has to stay in sync with the version in src/third_party/ninja/README.chromium. + 'ninja_version': 'version:2@1.11.1.chromium.6', } # Only these hosts are allowed for dependencies in this DEPS file. @@ -544,442 +549,9 @@ allowed_hosts = [ 'skia.googlesource.com', 'swiftshader.googlesource.com', 'webrtc.googlesource.com', - - # TODO(337061377): Move into a separate allowed gcs bucket list. - 'chromium-ads-detection', - 'chromium-browser-clang', - 'chromium-clang-format', - 'chromium-doclava', - 'chromium-nodejs', - 'chrome-linux-sysroot', - 'chromium-fonts', - 'chromium-style-perftest', - 'chromium-telemetry', - 'chromium-webrtc-resources', - 'perfetto', ] deps = { - # NPM dependencies for JavaScript code coverage. - 'src/third_party/js_code_coverage/node_modules': { - 'dep_type': 'gcs', - 'bucket': 'chromium-nodejs', - 'objects': [ - { - 'object_name': 'js_code_coverage/90d7a8ecae092222e585481b64e9928bcf4a689e723a0af4b94922280cd55a48', - 'sha256sum': '90d7a8ecae092222e585481b64e9928bcf4a689e723a0af4b94922280cd55a48', - 'size_bytes': 1472459, - 'generation': 1716929997740855 - } - ] - - }, - 'src/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, - }, - ], - }, - 'src/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, - }, - ], - }, - 'src/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, - }, - ], - }, - 'src/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, - }, - ], - }, - 'src/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, - }, - ], - }, - 'src/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, - }, - ], - }, - 'src/buildtools/win-format': { - 'bucket': 'chromium-clang-format', - 'condition': 'host_os == "win" and non_git_source', - 'dep_type': 'gcs', - 'objects': [ - { - 'object_name': '49458d4c1e884a38308f8dc6a2c7eb55fc478755', - 'sha256sum': '2f964ea355762d28005568a1cf888114d13b18631c618543586fb40589a22224', - 'size_bytes': 3214848, - 'generation': 1699478813805380, - 'output_file': 'clang-format.exe', - }, - ], - }, - 'src/buildtools/mac-format': { - 'bucket': 'chromium-clang-format', - 'condition': 'host_os == "mac" and host_cpu == "x64" and non_git_source', - 'dep_type': 'gcs', - 'objects': [ - { - 'object_name': '0b4bd257a1f4cd27d27d6919b0f9e52ecdfa8f1e', - 'sha256sum': '0f3c38a6af0a04fd4161f1948f02e83a8827727e77242d3b5b61ae4f009a270a', - 'size_bytes': 2869976, - 'generation': 1699478821342910, - 'output_file': 'clang-format', - }, - ], - }, - 'src/buildtools/mac_arm64-format': { - 'bucket': 'chromium-clang-format', - 'condition': 'host_os == "mac" and host_cpu == "arm64" and non_git_source', - 'dep_type': 'gcs', - 'objects': [ - { - 'object_name': '96c34e77259c4cc1fc7bdf067fc058bfd341ab85', - 'sha256sum': '66c5243cd530702defcbe18dffdbed0da9a3d1474b158a949580f6d269fbac17', - 'size_bytes': 2847744, - 'generation': 1699478828600976, - 'output_file': 'clang-format', - }, - ], - }, - 'src/buildtools/linux64-format': { - 'bucket': 'chromium-clang-format', - 'condition': 'host_os == "linux" and non_git_source', - 'dep_type': 'gcs', - 'objects': [ - { - 'object_name': 'b42097ca924d1f1736a5a7806068fed9d7345eb4', - 'sha256sum': '82df59a7d4390892c3eeaf0c8bf626e2869f1138a6ad3eb90dd51da0011ba630', - 'size_bytes': 3539912, - 'generation': 1699478806427152, - 'output_file': 'clang-format', - }, - ], - }, - 'src/third_party/data_sharing_sdk': { - 'packages': [ - { - 'package': 'chrome_internal/third_party/google3/data_sharing_sdk', - 'version': 't4zrKEZELPq_k-Rpzny0GLUOdcv_03R5n2pC9zT22c4C', - }, - ], - 'condition': 'checkout_src_internal and non_git_source', - 'dep_type': 'cipd', - }, - # Pull down Node binaries for WebUI toolchain. - # The Linux binary is always downloaded regardless of host os and architecture - # since remote node actions run on Linux worker. - # See also //third_party/node/node.gni - 'src/third_party/node/linux': { - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'bucket': 'chromium-nodejs', - 'objects': [ - { - 'object_name': 'fa98c6432de572206bc5519f85e9c96bd518b039', - 'sha256sum': 'fb563633b5bfe2d4307075c54c6bb54664a3b5ec6bc811f5b15742720549007a', - 'size_bytes': 50288755, - 'generation': 1730835522207929, - 'output_file': 'node-linux-x64.tar.gz', - }, - ], - }, - # The Mac x64/arm64 binaries are downloaded regardless of host architecture - # since it's possible to cross-compile for the other architecture. This can - # cause problems for tests that use node if the test device architecture does - # not match the architecture of the compile machine. - 'src/third_party/node/mac': { - 'dep_type': 'gcs', - 'condition': 'host_os == "mac" and non_git_source', - 'bucket': 'chromium-nodejs', - 'objects': [ - { - 'object_name': '4c8952a65a1ce7a2e4cff6db68f9b7454c46349f', - 'sha256sum': 'fadb4530fbe6e35ed298848c66102a0aa7d92974789e6222c4eadee26a381e7e', - 'size_bytes': 45672893, - 'generation': 1730835514382259, - 'output_file': 'node-darwin-x64.tar.gz', - }, - ], - }, - 'src/third_party/node/mac_arm64': { - 'dep_type': 'gcs', - 'condition': 'host_os == "mac" and non_git_source', - 'bucket': 'chromium-nodejs', - 'objects': [ - { - 'object_name': '0886aa6a146cb5c213cb09b59ed1075982e4cb57', - 'sha256sum': 'd39e2d44d58bb89740b9aca1073959fc92edbdbbe810a5e48448e331cf72c196', - 'size_bytes': 44929037, - 'generation': 1730835518292126, - 'output_file': 'node-darwin-arm64.tar.gz', - }, - ], - }, - 'src/third_party/node/win': { - 'dep_type': 'gcs', - 'condition': 'host_os == "win" and non_git_source', - 'bucket': 'chromium-nodejs', - 'objects': [ - { - 'object_name': '907d7e104e7389dc74cec7d32527c1db704b7f96', - 'sha256sum': '7447c4ece014aa41fb2ff866c993c708e5a8213a00913cc2ac5049ea3ffc230d', - 'size_bytes': 80511640, - 'generation': 1730835526374028, - 'output_file': 'node.exe', - }, - ], - }, - # Pull down NPM dependencies for WebUI toolchain. - 'src/third_party/node/node_modules': { - 'bucket': 'chromium-nodejs', - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'objects': [ - { - 'object_name': '59332695e189485e2e2b06e60e4d49d3d54b8e92', - 'sha256sum': 'a40ca106fa4d6b25cd0a3bb1c74991666ae91e9b5335799f1243da41f6d782ab', - 'size_bytes': 9100683, - 'generation': 1736178718186041, - 'output_file': 'node_modules.tar.gz', - }, - ], - }, - 'src/third_party/llvm-build/Release+Asserts': { - 'dep_type': 'gcs', - 'bucket': 'chromium-browser-clang', - 'condition': 'not llvm_force_head_revision', - 'objects': [ - { - # The Android libclang_rt.builtins libraries are currently only included in the Linux clang package. - 'object_name': 'Linux_x64/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'e649b5ae7db215ede1d17d63e60f187c9773bc3bb465e4ff25148f58783c0588', - 'size_bytes': 54177680, - 'generation': 1736382900858370, - 'condition': '(host_os == "linux" or checkout_android) and non_git_source', - }, - { - 'object_name': 'Linux_x64/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '98aeee7a6ea7b555868c16d009f0232c421ef88cb5a6a60c38b78255dd4faced', - 'size_bytes': 13149440, - 'generation': 1736382900905802, - 'condition': 'host_os == "linux" and checkout_clang_tidy and non_git_source', - }, - { - 'object_name': 'Linux_x64/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '767ad010ec7d99a62a2c6535cca8f3bc55c4866b2619462fb303e0bc9a5f1977', - 'size_bytes': 27687240, - 'generation': 1736382900911727, - 'condition': 'host_os == "linux" and checkout_clangd and non_git_source', - }, - { - 'object_name': 'Linux_x64/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'b61cee4a240859bab2b541721a5afd8333c0fc4eea2e568a63cf71529efefa76', - 'size_bytes': 2289668, - 'generation': 1736382900990620, - 'condition': 'host_os == "linux" and checkout_clang_coverage_tools and non_git_source', - }, - { - 'object_name': 'Linux_x64/llvmobjdump-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'a2eb777a2013c9d647c957b9cbb3d3937b66c6443ed9118d8a1eeb3fea6250d3', - 'size_bytes': 5348020, - 'generation': 1736382900960786, - 'condition': '(checkout_linux or checkout_mac or checkout_android and host_os != "mac") and non_git_source', - }, - { - 'object_name': 'Mac/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '40b2964db638f50f62c410202a0e150809b521eab8d764344dfcc82ce2fedda1', - 'size_bytes': 49122796, - 'generation': 1736382902685415, - 'condition': 'host_os == "mac" and host_cpu == "x64"', - }, - { - 'object_name': 'Mac/clang-mac-runtime-library-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '6dd34f8c8b70a1bf1453a74204c62669abe84e8e7f9625cbc16327b3fab8b943', - 'size_bytes': 972748, - 'generation': 1736382909396308, - 'condition': 'checkout_mac and not host_os == "mac"', - }, - { - 'object_name': 'Mac/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '194df82314e98d9c2b8c3d0810706bdedcdd60997b622eea07a1628ab94f28c3', - 'size_bytes': 12765652, - 'generation': 1736382902742379, - 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_tidy', - }, - { - 'object_name': 'Mac/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'a151f0d3958c8f469339c57f60e336cbf066fa94c5c841ac6b8e05cd09077890', - 'size_bytes': 26561888, - 'generation': 1736382902744981, - 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clangd', - }, - { - 'object_name': 'Mac/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'e14e803b4841a7a392f960278e7225b61453f1cca3086e7cdfb1c3cee813a85d', - 'size_bytes': 2250480, - 'generation': 1736382902843064, - 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_coverage_tools', - }, - { - 'object_name': 'Mac_arm64/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '11238b743b1c3157b64f261118ee0884f5b7f5f9afc235d4c47c1afc52556b1b', - 'size_bytes': 43127752, - 'generation': 1736382911237265, - 'condition': 'host_os == "mac" and host_cpu == "arm64"', - }, - { - 'object_name': 'Mac_arm64/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '00a42f1c03272d8f9e0c9531712110422936fb9365c66206becdc7dfa27500d8', - 'size_bytes': 11362620, - 'generation': 1736382911277357, - 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_tidy', - }, - { - 'object_name': 'Mac_arm64/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'eb2c179811101e49a6156b55624a6292688c0a4ef1e79d0b05ef03f2a17f405f', - 'size_bytes': 22998836, - 'generation': 1736382911247931, - 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clangd', - }, - { - 'object_name': 'Mac_arm64/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '9c06d812bf98fc1ca1de9afaf031efa2334b3c1039969ee90689a810726db83c', - 'size_bytes': 1977132, - 'generation': 1736382911314127, - 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_coverage_tools', - }, - { - 'object_name': 'Win/clang-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '554d4d0b22b7c682dd05bb912b9f2c1a13248d38660f3f1e15444ef0970fb0e5', - 'size_bytes': 46344548, - 'generation': 1736382920155077, - 'condition': 'host_os == "win"', - }, - { - 'object_name': 'Win/clang-tidy-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'fbb40ae15b7c2fc408d8329eb6274d3422c6fb4110f27655adb8cd642d7b62b5', - 'size_bytes': 12970212, - 'generation': 1736382920246226, - 'condition': 'host_os == "win" and checkout_clang_tidy', - }, - { - 'object_name': 'Win/clang-win-runtime-library-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '98a76f1ec725bbf112fe91ba007bc39ca1efe1f1923d1c5a7cf2812e8c34b218', - 'size_bytes': 2458356, - 'generation': 1736382926959753, - 'condition': 'checkout_win and not host_os == "win"', - }, - { - 'object_name': 'Win/clangd-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': 'f766b3623240184b7d668b8e4e9c6070f6c56ee676cfed9a98375653922ccda8', - 'size_bytes': 25602964, - 'generation': 1736382920261395, - 'condition': 'host_os == "win" and checkout_clangd', - }, - { - 'object_name': 'Win/llvm-code-coverage-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '7f23a02c44dac5fb1139cc5943fc764b7c49bab152c76a416785f1413cfbaf0d', - 'size_bytes': 2361572, - 'generation': 1736382920285247, - 'condition': 'host_os == "win" and checkout_clang_coverage_tools', - }, - { - 'object_name': 'Win/llvmobjdump-llvmorg-20-init-17108-g29ed6000-1.tar.xz', - 'sha256sum': '8884520329694e6f35ab9790f65a474e04bafc541d6d40592f43356f44ee0d40', - 'size_bytes': 5439908, - 'generation': 1736382920291826, - 'condition': 'checkout_linux or checkout_mac or checkout_android and host_os == "win"', - }, - ] - }, - # Update prebuilt Rust toolchain. - 'src/third_party/rust-toolchain': { - 'dep_type': 'gcs', - 'bucket': 'chromium-browser-clang', - 'objects': [ - { - 'object_name': 'Linux_x64/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', - 'sha256sum': '1363529d7285ca8623c6408d49419921d459bbc461fa26ae57f5b5a620a57cc2', - 'size_bytes': 124591376, - 'generation': 1736456746490086, - 'condition': 'host_os == "linux" and non_git_source', - }, - { - 'object_name': 'Mac/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', - 'sha256sum': 'bc2446c14bf6316ab2a5797b65daf229aecb65e1fa25184ec740137196ec111e', - 'size_bytes': 117535632, - 'generation': 1736456748324065, - 'condition': 'host_os == "mac" and host_cpu == "x64"', - }, - { - 'object_name': 'Mac_arm64/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', - 'sha256sum': '879947f21091c62096297c34c3e0a3f2e1f79260fb9b3c3c40091d62c65fb04e', - 'size_bytes': 102626588, - 'generation': 1736456750286270, - 'condition': 'host_os == "mac" and host_cpu == "arm64"', - }, - { - 'object_name': 'Win/rust-toolchain-ad211ced81509462cdfe4c29ed10f97279a0acae-1-llvmorg-20-init-17108-g29ed6000.tar.xz', - 'sha256sum': '294a0a338bc46626b38d0d243f6f9a308dc2517cbf8961e2dc0edbf51b8d0ae9', - 'size_bytes': 176895424, - 'generation': 1736456752082017, - 'condition': 'host_os == "win"', - }, - ], - }, 'src/hopium/tslib_hopium': { 'url': Var('hopium_git') + '/tslib_hopium.git' + '@' + '686d3f51ebf70ba8097de852a90b0ef710dcea76', 'condition': 'build_with_hopium', @@ -1008,7 +580,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_os == "linux" and non_git_source', + 'condition': 'host_os == "linux"', }, 'src/buildtools/mac': { 'packages': [ @@ -1037,7 +609,6 @@ deps = { 'version': Var('reclient_version'), } ], - 'condition': 'non_git_source', 'dep_type': 'cipd', }, @@ -1052,7 +623,7 @@ deps = { }, ], 'dep_type': 'cipd', - 'condition': 'checkout_mac or checkout_ios', + 'condition': '(host_os == "mac")', }, 'src/third_party/apache-mac-arm64': { 'packages': [ @@ -1062,7 +633,7 @@ deps = { }, ], 'dep_type': 'cipd', - 'condition': 'checkout_mac or checkout_ios', + 'condition': '(host_os == "mac")', }, 'src/third_party/apache-linux': { @@ -1073,28 +644,28 @@ deps = { }, ], 'dep_type': 'cipd', - 'condition': '(host_os == "linux") and non_git_source', + 'condition': '(host_os == "linux")', }, 'src/third_party/apache-windows-arm64': { 'packages': [ { 'package': 'infra/3pp/tools/httpd-php/windows-arm64', - 'version': 'version:3@httpd2.4.55-php8.2.5.chromium.6', + 'version': 'version:2@httpd2.4.55-php8.2.5.chromium.6.chromium.5', } ], 'dep_type': 'cipd', - 'condition': 'checkout_win' + 'condition': '(host_os == "win")' }, - 'src/third_party/aosp_dalvik/cipd': { + 'src/third_party/aosp_dalvik': { 'packages': [ { 'package': 'chromium/third_party/aosp_dalvik/linux-amd64', 'version': 'version:2@13.0.0_r24.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -1102,39 +673,34 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/cronet_android_mainline_clang/linux-amd64', - 'version': 'V0dPF9Cc6TYEaE6vsPyJoFO6xD2_NglmR7Gbqrp7d-sC', + 'version': 'cOWHyVbQYOA9ATyuUaYmOE6YLer1h1JFFa6KRS3_hjIC', }, ], 'condition': 'checkout_android and host_os == "linux"', 'dep_type': 'cipd', }, - 'src/android_webview/tools/cts_archive/cipd': { + 'src/android_webview/tools/cts_archive': { 'packages': [ { 'package': 'chromium/android_webview/tools/cts_archive', - 'version': 'UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC', + 'version': 'D9ziv4Z61qHwterMTFEoPeCZzFNyUfMnWAlYuxEKlM8C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/chrome/browser/resources/preinstalled_web_apps/internal': { - 'url': Var('chrome_git') + '/chrome/components/default_apps.git' + '@' + 'ef722130bdfed458eb5380f10585b880ae5dff4e', + 'url': Var('chrome_git') + '/chrome/components/default_apps.git' + '@' + '3610b316398d68e3ae89388c03cb8bd8eb30e76a', 'condition': 'checkout_src_internal', }, 'src/chrome/installer/mac/third_party/xz/xz': { - 'url': Var('chromium_git') + '/chromium/deps/xz.git' + '@' + '10d236393a338a55830db628356f022a91978b61', + 'url': Var('chromium_git') + '/chromium/deps/xz.git' + '@' + 'eecaf55632ca72e90eb2641376bce7cdbc7284f7', 'condition': 'checkout_mac', }, - 'src/chrome/release_scripts': { - 'url': Var('chrome_git') + '/chrome/tools/release/scripts' + '@' + 'cc3ac97c66a56f4218fee70f28958eaf11ef5d66', - 'condition': 'checkout_chrome_release_scripts', - }, - 'src/third_party/libc++/src': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + @@ -1147,312 +713,144 @@ deps = { Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + Var('libunwind_revision'), - 'src/third_party/llvm-libc/src': - Var('chromium_git') + - '/external/github.com/llvm/llvm-project/libc.git' + '@' + - Var('llvm_libc_revision'), - 'src/third_party/updater/chrome_linux64/cipd': { + 'src/third_party/updater/chrome_linux64': { 'dep_type': 'cipd', - 'condition': 'checkout_linux and non_git_source', + 'condition': 'checkout_linux', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_linux64', - 'version': 'ytJ0UbU9gMLUMLRQlmqQpGpOy1dYswI3rOJ0ILnIFbUC', + 'version': 'iSlHWT_rV1izyFEkrQSJUVMZ_Z_8yUezA1tZGxQGsyQC', }, ], }, - 'src/third_party/updater/chrome_mac_universal/cipd': { + 'src/third_party/updater/chrome_mac_universal': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_mac_universal', - 'version': 'gzutuY-G7u8n5746jgmishm8uWjUR070TXdFc23Ea7YC', + 'version': 'wqWHMpsZxCa2LfUjZrdZkjgOQ80CkkHwst9JdQFFkAkC', }, ], }, - 'src/third_party/updater/chrome_mac_universal_prod/cipd': { + 'src/third_party/updater/chrome_mac_universal_prod': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_mac_universal_prod', - # 129.0.6651.0 - 'version': 'IrAigaqukp1GbaksroZcR3Jo0oOYKg9kzatjzNNbXKQC', - }, - ], - }, - - # version:2@132.0.6833.0 - 'src/third_party/updater/chrome_win_arm64/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chrome_win_arm64', - 'version': 'OoGMyCUHah7D_AOVm4RpVoPOdkGqjFHuSMcoKTZ0rlsC', + 'version': 'M_TrB6I8-_jAoxW0cj0EnHM5pEwvgZO18jFILu8R4LcC', }, ], }, - # version:2@132.0.6833.0 - 'src/third_party/updater/chrome_win_x86/cipd': { + 'src/third_party/updater/chrome_win_x86': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_win_x86', - 'version': 'gqhcrVQFtXAKUu7yEISTlbrBpPaBUnQZ6FdOo5E4HLQC', + 'version': 'zvfjrCzT9GNDVHymDY88NGn2IrVKA_tYd-V_QmTqt28C', }, ], }, - # version:2@132.0.6833.0 - 'src/third_party/updater/chrome_win_x86_64/cipd': { + 'src/third_party/updater/chrome_win_x86_64': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { 'package': 'chromium/third_party/updater/chrome_win_x86_64', - 'version': 'koo1i4cAVdOK2-re2VGbx-crCcbTz9h0qumUk1hyEt0C', + 'version': '4FUbb3_htxuPk87RNmno-bfZaJWidzjHyt5NZFkf8boC', }, ], }, - # Branded builds for testing previous interface without `install_id` support. - 'src/third_party/updater/chrome_linux64_sans_iid/cipd': { + 'src/third_party/updater/chromium_linux64': { 'dep_type': 'cipd', - 'condition': 'checkout_linux and non_git_source', + 'condition': 'checkout_linux', 'packages': [ { - 'package': 'chromium/third_party/updater/chrome_linux64', - 'version': 'ytJ0UbU9gMLUMLRQlmqQpGpOy1dYswI3rOJ0ILnIFbUC', + 'package': 'chromium/third_party/updater/chromium_linux64', + 'version': '_-1WRZ9erGXLnlB11zitYjO6gARR5x7_IzwYxKkZHh8C', }, ], }, - 'src/third_party/updater/chrome_mac_universal_sans_iid/cipd': { + # A somewhat recent Chromium-branded updater build. (x86_64) + 'src/third_party/updater/chromium_mac_amd64': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { - 'package': 'chromium/third_party/updater/chrome_mac_universal', - 'version': 'gzutuY-G7u8n5746jgmishm8uWjUR070TXdFc23Ea7YC', + 'package': 'chromium/third_party/updater/chromium_mac_amd64', + 'version': 'ZsZx8bFql21zupbHw4O5qS6QZr02Nc8kTsp_2e2IjToC', }, ], }, - 'src/third_party/updater/chrome_mac_universal_prod_sans_iid/cipd': { + # A somewhat recent Chromium-branded updater build. (ARM64) + 'src/third_party/updater/chromium_mac_arm64': { 'dep_type': 'cipd', 'condition': 'checkout_mac', 'packages': [ { - 'package': 'chromium/third_party/updater/chrome_mac_universal_prod', - # 129.0.6651.0 - 'version': 'IrAigaqukp1GbaksroZcR3Jo0oOYKg9kzatjzNNbXKQC', + 'package': 'chromium/third_party/updater/chromium_mac_arm64', + 'version': '79GoWALQHkg2rvF55fdXXNks2q0Dc75_qGhHIbik7MoC', }, ], }, - 'src/third_party/updater/chrome_win_arm64_sans_iid/cipd': { + 'src/third_party/updater/chromium_win_x86': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { - 'package': 'chromium/third_party/updater/chrome_win_arm64', - 'version': 'OoGMyCUHah7D_AOVm4RpVoPOdkGqjFHuSMcoKTZ0rlsC', + 'package': 'chromium/third_party/updater/chromium_win_x86', + 'version': 'eUElHsZXgwIguZXRg9XYE6JnGDbIPb6JkE0eweQTcrEC', }, ], }, - 'src/third_party/updater/chrome_win_x86_sans_iid/cipd': { + 'src/third_party/updater/chromium_win_x86_64': { 'dep_type': 'cipd', 'condition': 'checkout_win', 'packages': [ { - 'package': 'chromium/third_party/updater/chrome_win_x86', - 'version': 'gqhcrVQFtXAKUu7yEISTlbrBpPaBUnQZ6FdOo5E4HLQC', + 'package': 'chromium/third_party/updater/chromium_win_x86_64', + 'version': 'mQMfJlYl97M50ArghATBzIkNr-NajsEvVnJHQE_gsOQC', }, ], }, - 'src/third_party/updater/chrome_win_x86_64_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chrome_win_x86_64', - 'version': 'koo1i4cAVdOK2-re2VGbx-crCcbTz9h0qumUk1hyEt0C', - }, - ], + 'src/chrome/test/data/autofill/captured_sites/artifacts': { + 'url': Var('chrome_git') + '/chrome/test/captured_sites/autofill.git' + '@' + '654ecc6e5f3948e6c2dd42df13d2345f4f88bac3', + 'condition': 'checkout_chromium_autofill_test_dependencies', }, - 'src/third_party/updater/chromium_linux64/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_linux and non_git_source', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_linux64', - 'version': 'OLbfeePAbqPnFqcPmkFtR-GK8dN3T3NeH2AChZwBHjgC', - }, - ], + 'src/chrome/test/data/password/captured_sites/artifacts': { + 'url': Var('chrome_git') + '/chrome/test/captured_sites/password.git' + '@' + '04b3ea663adf745c52831650e2426b54bc94e65d', + 'condition': 'checkout_chromium_password_manager_test_dependencies', }, - # A somewhat recent Chromium-branded updater build. (x86_64) - 'src/third_party/updater/chromium_mac_amd64/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_mac', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_mac_amd64', - 'version': 'zVv93X5XSClxTR1YejkQuBdSpye7JfPS_h6GcH1N4i4C', - }, - ], - }, + 'src/chrome/test/data/perf/canvas_bench': + Var('chromium_git') + '/chromium/canvas_bench.git' + '@' + 'a7b40ea5ae0239517d78845a5fc9b12976bfc732', - # A somewhat recent Chromium-branded updater build. (ARM64) - 'src/third_party/updater/chromium_mac_arm64/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_mac', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_mac_arm64', - 'version': 'Va20qxSst3lq4WfEZlWiwzXCpSo5XbhhuqJXyqzvhF8C', - }, - ], - }, + 'src/chrome/test/data/perf/frame_rate/content': + Var('chromium_git') + '/chromium/frame_rate/content.git' + '@' + 'c10272c88463efeef6bb19c9ec07c42bc8fe22b9', - # r1372006 - 'src/third_party/updater/chromium_win_arm64/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_win_arm64', - 'version': 'ksRzLnqewvz7P-YMX2e8mxZuDI1hgPtLNCuAXIisXhoC', - }, - ], - }, - - # r1372046 - 'src/third_party/updater/chromium_win_x86/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_win_x86', - 'version': 'tcFWGGE3wmwKDhT_s-9mzPiQVYxMOI1U9sRAhm1_5QcC', - }, - ], - }, - - # r1372030 - 'src/third_party/updater/chromium_win_x86_64/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_win_x86_64', - 'version': 'iXamEEmbStVBV_c-vEG4Xtrda8tTqSRCZ-tmE7VRHb0C', - }, - ], - }, - - # Chromium builds for testing previous interface without `install_id` support. - 'src/third_party/updater/chromium_linux64_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_linux and non_git_source', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_linux64', - 'version': 'OLbfeePAbqPnFqcPmkFtR-GK8dN3T3NeH2AChZwBHjgC', - }, - ], - }, - - 'src/third_party/updater/chromium_mac_amd64_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_mac', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_mac_amd64', - 'version': 'zVv93X5XSClxTR1YejkQuBdSpye7JfPS_h6GcH1N4i4C', - }, - ], - }, - - 'src/third_party/updater/chromium_mac_arm64_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_mac', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_mac_arm64', - 'version': 'Va20qxSst3lq4WfEZlWiwzXCpSo5XbhhuqJXyqzvhF8C', - }, - ], - }, - - 'src/third_party/updater/chromium_win_arm64_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_win_arm64', - 'version': 'ksRzLnqewvz7P-YMX2e8mxZuDI1hgPtLNCuAXIisXhoC', - }, - ], - }, - - 'src/third_party/updater/chromium_win_x86_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_win_x86', - 'version': 'tcFWGGE3wmwKDhT_s-9mzPiQVYxMOI1U9sRAhm1_5QcC', - }, - ], - }, - - 'src/third_party/updater/chromium_win_x86_64_sans_iid/cipd': { - 'dep_type': 'cipd', - 'condition': 'checkout_win', - 'packages': [ - { - 'package': 'chromium/third_party/updater/chromium_win_x86_64', - 'version': 'iXamEEmbStVBV_c-vEG4Xtrda8tTqSRCZ-tmE7VRHb0C', - }, - ], - }, - - 'src/chrome/test/data/autofill/captured_sites/artifacts': { - 'url': Var('chrome_git') + '/chrome/test/captured_sites/autofill.git' + '@' + '8c66a34eccf070d66903db5db487bc1de597e7c6', - 'condition': 'checkout_chromium_autofill_test_dependencies', - }, - - 'src/chrome/test/data/password/captured_sites/artifacts': { - 'url': Var('chrome_git') + '/chrome/test/captured_sites/password.git' + '@' + '61b62cfe23abcdb7e86e3aa6b0690bd457d04604', - 'condition': 'checkout_chromium_password_manager_test_dependencies', - }, - - 'src/chrome/test/data/perf/canvas_bench': - Var('chromium_git') + '/chromium/canvas_bench.git' + '@' + 'a7b40ea5ae0239517d78845a5fc9b12976bfc732', - - 'src/chrome/test/data/perf/frame_rate/content': - Var('chromium_git') + '/chromium/frame_rate/content.git' + '@' + 'c10272c88463efeef6bb19c9ec07c42bc8fe22b9', - - 'src/chrome/test/data/safe_browsing/dmg': { - 'packages': [ - { - 'package': 'chromium/chrome/test/data/safe_browsing/dmg', - 'version': '03TLfNQgc59nHmyWtYWJfFaUrEW8QDJJzXwm-672m-QC', - }, - ], - 'condition': 'checkout_mac', - 'dep_type': 'cipd', + 'src/chrome/test/data/safe_browsing/dmg': { + 'packages': [ + { + 'package': 'chromium/chrome/test/data/safe_browsing/dmg', + 'version': '03TLfNQgc59nHmyWtYWJfFaUrEW8QDJJzXwm-672m-QC', + }, + ], + 'condition': 'checkout_mac', + 'dep_type': 'cipd', }, 'src/chrome/test/data/xr/webvr_info': @@ -1460,21 +858,21 @@ deps = { 'src/clank': { 'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' + - 'eefbf9fd0ad615aa04bd7ea85c17048ed076f936', + '36b175764dc5eff90f46b004457effdf26664d0b', 'condition': 'checkout_android and checkout_src_internal', }, 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + 'd449eb6e9d475df9e5a54125e6582baba549280e', + 'url': Var('chromium_git') + '/website.git' + '@' + '49c12aba2275832dc5d645c12defc3e41f076392', }, 'src/ios/third_party/earl_grey2/src': { - 'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + '43b9544b8f6691363b578bdefa32b884c5200cd9', + 'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + '37e7433033659e9f49202a7d94381796b5e83f47', 'condition': 'checkout_ios', }, 'src/ios/third_party/edo/src': { - 'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git' + '@' + '8c825efc8ba6ca9147a148445449470a66b9dc54', + 'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git' + '@' + '726d5e6fc7c316bfeea43716e5caa0adea4ecdae', 'condition': 'checkout_ios', }, @@ -1489,7 +887,7 @@ deps = { }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'b5bbb66b58798106ab6d1cab32a22288d3ccabd4', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '17a0a793219751121f03e795bbd467d465b76788', 'condition': 'checkout_ios', }, @@ -1545,7 +943,7 @@ deps = { }, 'src/media/cdm/api': - Var('chromium_git') + '/chromium/cdm.git' + '@' + '06395a2863cb1ebdb47617a995b73f95c14fe120', + Var('chromium_git') + '/chromium/cdm.git' + '@' + 'fef0b5aa1bd31efb88dfab804bdbe614f3d54f28', 'src/native_client': { 'url': Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'), @@ -1555,27 +953,52 @@ deps = { 'src/net/third_party/quiche/src': Var('quiche_git') + '/quiche.git' + '@' + Var('quiche_revision'), - 'src/testing/libfuzzer/fuzzers/wasm_corpus': - Var('chromium_git') + '/v8/fuzzer_wasm_corpus.git' + '@' + '1df5e50a45db9518a56ebb42cb020a94a090258b', + 'src/testing/rts/linux-amd64': { + 'packages': [ + { + 'package': 'chromium/rts/model/linux-amd64', + 'version': '-MNzMfbaq88xANs_FwsnP3W56cD6R38bM3rV4PKoy7gC', + }, + ], + 'dep_type': 'cipd', + 'condition': 'checkout_rts_model and checkout_linux', + }, + + 'src/testing/rts/mac-amd64': { + 'packages': [ + { + 'package': 'chromium/rts/model/mac-amd64', + 'version': 'JZuaq-qPwX9_ihJIiHR5Js5D6yxFPn-lqJhk-BX6BWEC', + }, + ], + 'dep_type': 'cipd', + 'condition': 'checkout_rts_model and checkout_mac', + }, - 'src/tools/copybara': { - 'packages' : [ - { - 'package': 'infra/3pp/tools/copybara', - 'version': '_rad--EmYH2N8Qy7KNGyo4OnjbEVF67u2mqff_Q6lg8C', - }, + 'src/testing/rts/windows-amd64': { + 'packages': [ + { + 'package': 'chromium/rts/model/windows-amd64', + 'version': 'IKBcF0i7FUmPPRq6B2HRp5duZkH7Mqr4P8mLZOz-bcsC', + }, ], - 'condition': 'host_os == "linux" and checkout_copybara', 'dep_type': 'cipd', + 'condition': 'checkout_rts_model and checkout_win', }, - 'src/tools/luci-go': { + 'src/testing/rts/rts-ml-chromium/linux-amd64': { 'packages': [ { - 'package': 'infra/tools/luci/cas/${{platform}}', - 'version': Var('luci_go'), + 'package': 'experimental/google.com/sshrimp/chromium/rts/model/linux-amd64', + 'version': '61RZ40XmEInOMhnIJMEqdOjocdCHqodmEJcDxu4x7uIC', }, - # TODO(crbug.com/382506663): Remove after investigation/deprecation + ], + 'dep_type': 'cipd', + 'condition': 'checkout_rts_experimental_model and checkout_linux', + }, + + 'src/tools/luci-go': { + 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', 'version': Var('luci_go'), @@ -1585,22 +1008,33 @@ deps = { 'version': Var('luci_go'), }, ], - 'condition': 'non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/accessibility_test_framework/src': { - 'url': Var('chromium_git') + '/external/github.com/google/Accessibility-Test-Framework-for-Android.git' + '@' + '4a764c690353ea136c82f1a696a70bf38d1ef5fe', + 'src/third_party/accessibility_test_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/accessibility-test-framework', + 'version': 'b5ec1e56e58e56bc1a0c77d43111c37f9b512c8a', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_protobuf/src': { + 'url': Var('android_git') + '/platform/external/protobuf.git' + '@' + '7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f', + 'condition': 'checkout_android', }, - 'src/third_party/android_build_tools/protoc/cipd': { + 'src/third_party/android_protoc': { 'packages': [ { - 'package': 'chromium/third_party/android_build_tools/protoc', - 'version': 'ivH_8voaWaRDbk7bDHj8n5YR2IH7sFuenkqy0bVOb2cC', + 'package': 'chromium/third_party/android_protoc', + 'version': 'sLsJWojddBL2u8NYwNh6pJsqp_bL1ttmYIlBnhiIQ1QC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -1608,163 +1042,131 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_toolchain/android_toolchain', - 'version': 'Idl-vYnWGnM8K3XJhM3h6zjYVDXlnljVz3FE00V9IM8C', + 'version': 'R_8suM8m0oHbZ1awdxGXvKEFpAOETscbfZxkkMthyk8C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android_native_support', 'dep_type': 'cipd', }, - 'src/third_party/androidx/cipd': { + 'src/third_party/androidx': { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'VWuP17o8bAsMqJ5b_3fu60qkAIWd905hpPI83flbNrMC', + 'version': 'DoS0WwXEMCOY-zSJ8hINm4vTrX1WPpwf43I2K2XtcM4C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/androidx_javascriptengine/src': { - 'url': Var('chromium_git') + '/aosp/platform/frameworks/support/javascriptengine/javascriptengine/src.git' + '@' + 'e3b6fc680728040f97442dc29d978ce5df6e76f4', + 'url': Var('chromium_git') + '/aosp/platform/frameworks/support/javascriptengine/javascriptengine/src.git' + '@' + '30ea6d647887c3bdfc47b04764b3444d0179f61b', 'condition': 'checkout_android', }, - 'src/third_party/android_system_sdk/cipd': { + 'src/third_party/android_system_sdk': { 'packages': [ { 'package': 'chromium/third_party/android_system_sdk/public', - 'version': 'XzzECzCzGLrccJS1U-HdmM5VMh9BotgQ_mWhFQ464PwC', + 'version': '4QeolYaSKWBtVTgzJU4tHUfzA9OJTDM8YUcD426IctwC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/aapt2/cipd': { + 'src/third_party/android_build_tools/aapt2': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/aapt2', - 'version': '_lNsOL_GGlXLOIMGtrbMOqNd7TQHabaP1q8SlvUpFbMC', + 'version': 'STY0BXlZxsEhudnlXQFed-B5UpwehcoM0sYqor6qRqsC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/apkanalyzer/cipd': { + 'src/third_party/android_build_tools/apkanalyzer': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/apkanalyzer', 'version': 'O8Lyta0y6jpvFD1rbPp7trvcM2rdny3ngyhyeYAWXK4C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/bundletool/cipd': { + 'src/third_party/android_build_tools/bundletool': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/bundletool', - 'version': 'tal0sHGlqsDFNFQ5lV1zRomrRs0Ppq6ngUOYbACAAUwC', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_build_tools/dagger_compiler/cipd': { - 'packages': [ - { - 'package': 'chromium/third_party/android_build_tools/dagger_compiler', - 'version': 'AC0DoTEXQf40KFt7hyCNSEJPrT9Rprw9zsZxNKdw7BQC', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_build_tools/error_prone/cipd': { - 'packages': [ - { - 'package': 'chromium/third_party/android_build_tools/error_prone', - 'version': '7c91BXn6VPvSmr-dFRYaNVkfHjRN1jdMIN4EcrPem9cC', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_build_tools/error_prone_javac/cipd': { - 'packages': [ - { - 'package': 'chromium/third_party/android_build_tools/error_prone_javac', - 'version': '7EcHxlEXEaLRWEyHIAxf0ouPjkmN1Od6jkutuo0sfBIC', + 'version': '2RPwohwtc6on0_96oFxokeEvnC1LbLrGuyCAw00k62AC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/lint/cipd': { + 'src/third_party/android_build_tools/lint': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/lint', - 'version': '_77LT8DN3c2A3RPC4ctJk-kOk2K_QEuS3_aQty7g384C', + 'version': 'qaZOeTY-k9wAZ1vkdqCZIbppqQFgc4IM5T5dKj3_2xIC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/manifest_merger/cipd': { + 'src/third_party/android_build_tools/manifest_merger': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/manifest_merger', - 'version': 'osgd04hyZB3eu5L7oiL6irk9AqRBX9lOxNLsaCmUCowC', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_build_tools/nullaway/cipd': { - 'packages': [ - { - 'package': 'chromium/third_party/android_build_tools/nullaway', - 'version': '65WJkoinJEXvtu9xwdDNDb3QCbqBAl8FKDpgnXr3iiEC', + 'version': 'Nc9kYyTsw69N7yKSw_Sc2fJtUJ2zXUhSGjXbIkDVXuIC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/android_sdk/public': { 'packages': [ { - 'package': 'chromium/third_party/android_sdk/public/build-tools/35.0.0', + 'package': 'chromium/third_party/android_sdk/public/build-tools/34.0.0', 'version': Var('android_sdk_build-tools_version'), }, { 'package': 'chromium/third_party/android_sdk/public/emulator', 'version': Var('android_sdk_emulator_version'), }, + { + 'package': 'chromium/third_party/android_sdk/public/patcher', + 'version': Var('android_sdk_patcher_version'), + }, { 'package': 'chromium/third_party/android_sdk/public/platform-tools', 'version': Var('android_sdk_platform-tools_version'), }, { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-35', + 'package': 'chromium/third_party/android_sdk/public/platforms/android-34', 'version': Var('android_sdk_platforms_version'), }, + { + 'package': 'chromium/third_party/android_sdk/public/platforms/android-tiramisuprivacysandbox', + 'version': Var('android_sdk_platforms_preview_version'), + }, + { + 'package': 'chromium/third_party/android_sdk/public/sources/android-31', + 'version': Var('android_sdk_sources_version'), + }, { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', - 'version': 'OCGHZKTdjXjIELVI6FMAgcDkfnd_1ybB0_MtljPtz-8C', + 'version': 'Sy00LuyBIUJdRGYKwg0zjWH8eAIUvgnnNiPkI8etaZYC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android_native_support', 'dep_type': 'cipd', }, @@ -1772,84 +1174,13 @@ deps = { Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'), 'src/third_party/anonymous_tokens/src': - Var('chromium_git') + '/external/github.com/google/anonymous-tokens.git' + '@' + '6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8', - - 'src/third_party/blink/renderer/core/css/perftest_data': { - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'bucket': 'chromium-style-perftest', - 'objects': [ - { - 'object_name': 'e9ce994346c62f8c9fd6d0cecb2b2b0b93b4c2d8', - 'sha256sum': '519019df16c628c6c0893df18928faeaa3150a9d8f26a787a16ce7c6b2cec2ad', - 'size_bytes': 601672, - 'generation': 1664794185950162, - 'output_file': 'ecommerce.json', - }, - { - 'object_name': '756068da5e551516b23b0ba133e55c144f623d38', - 'sha256sum': '84ef87a8163335a95111d9709306596f96742539da0b34fbe7397f799946a168', - 'size_bytes': 2156935, - 'generation': 1664794188995509, - 'output_file': 'encyclopedia.json', - }, - { - 'object_name': '314e4e0d5e89ea9e9e9a234c617b4413adf48aa9', - 'sha256sum': 'a721ada40011a286631baae6d76878f2023ff000151792228c83b1958ea8a197', - 'size_bytes': 608840, - 'generation': 1664794191929032, - 'output_file': 'extension.json', - }, - { - 'object_name': '3a19b42a7c46257b716d55d6733f070c87180b1e', - 'sha256sum': 'f203ff9e8c8a6a3b714f0a26db38cc940544a907435c62c79b21f4bd3f8bee8e', - 'size_bytes': 1750837, - 'generation': 1664794194891567, - 'output_file': 'news.json', - }, - { - 'object_name': 'fdc43ee18cbd65487249441849f58aa13484aaef', - 'sha256sum': '0e92de92f49abc9a521f7175106c80744196f8cefc0263bc0f4a6b4f724a7d10', - 'size_bytes': 1310798, - 'generation': 1664794197855470, - 'output_file': 'search.json', - }, - { - 'object_name': '7fc9338af75b7d9d185c91ddf262a356def5623d', - 'sha256sum': '34e92acae8aade2a186abe79ed1f379c266f04f72f1eb54bd3a912e889bc5cc0', - 'size_bytes': 2280846, - 'generation': 1664794200867034, - 'output_file': 'social1.json', - }, - { - 'object_name': 'c2d7e9ce67522dad138c7feb0a6911b828bfb130', - 'sha256sum': '95c6b148577b891310c024b2daa5d68faf644a37707ac0cb21501eefe8a399a3', - 'size_bytes': 411708, - 'generation': 1664794203829582, - 'output_file': 'social2.json', - }, - { - 'object_name': '031d5599c8a21118754e30dbea141be66104f556', - 'sha256sum': '8e7b765d72bb8e7742f5bf955f4bf64d5469f61197dad8b632304095a52322d7', - 'size_bytes': 3203922, - 'generation': 1664794206824773, - 'output_file': 'sports.json', - }, - { - 'object_name': '8aac3db2a8c9e44babec81e539a3d60aeab4985c', - 'sha256sum': '6aeb0036dfafaf5e905abdb0ffe515a3952ffe35a7c59afb0fc8b233b27c6ce4', - 'size_bytes': 5902660, - 'generation': 1664794209886788, - 'output_file': 'video.json', - }, - ], - }, + Var('chromium_git') + '/external/github.com/google/anonymous-tokens.git' + '@' + '8c8d20953d502db31fec2353b199e6c22ef0236e', 'src/third_party/content_analysis_sdk/src': - Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + '9a408736204513e0e95dd2ab3c08de0d95963efc', + Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + '8d5118720805fdce0dd3ee2999c964501de4532c', 'src/third_party/dav1d/libdav1d': - Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'edb16889d16f5e13161b6e8f7a839cd82d7d655d', + Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'f8ae94eca0f53502a2cddd29a263c1edea4822a0', 'src/third_party/dawn': Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'), @@ -1863,37 +1194,43 @@ deps = { }, 'src/third_party/barhopper': { - 'url': Var('chrome_git') + '/chrome/deps/barhopper.git' + '@' + '9230af4dc38c6d2cc9c0841692267762ebfca991', + 'url': Var('chrome_git') + '/chrome/deps/barhopper.git' + '@' + '865bd06ef4a839b0a15d17e38e25f8911e4cdf9f', 'condition': 'checkout_src_internal and checkout_chromeos', }, 'src/third_party/google_benchmark/src': - Var('chromium_git') + '/external/github.com/google/benchmark.git' + '@' + '761305ec3b33abf30e08d50eb829e19a802581cc', + Var('chromium_git') + '/external/github.com/google/benchmark.git' + '@' + 'b177433f3ee2513b1075140c723d73ab8901790f', - # Download test data for Maps telemetry_gpu_integration_test. - 'src/tools/perf/page_sets/maps_perf_test/dataset': { - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'bucket': 'chromium-telemetry', - 'objects': [ + 'src/third_party/boringssl/src': + Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), + + 'src/third_party/breakpad/breakpad': + Var('chromium_git') + '/breakpad/breakpad.git' + '@' + '8988364bcddd9b194b0bf931c10bc125987330ed', + + 'src/third_party/byte_buddy': { + 'packages': [ { - 'object_name': 'e6bf26977c2fd80c18789d1f279d474096a7b0d1', - 'sha256sum': 'f5f7fe360ad2b9c3d9dda2612f17336c0541bac15b4e4992f2c167e059a190fa', - 'size_bytes': 3285237, - 'generation': 1513305740113238, - 'output_file': 'load_dataset', + 'package': 'chromium/third_party/byte_buddy', + 'version': 'c9b53316603fc2d997c899c7ca1707f809b918cd', }, ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', }, - 'src/third_party/boringssl/src': - Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), - - 'src/third_party/breakpad/breakpad': - Var('chromium_git') + '/breakpad/breakpad.git' + '@' + '0dfd77492fdb0dcd06027c5842095e2e908adc90', + 'src/third_party/byte_buddy/android_sdk_build_tools_25_0_2': { + 'packages': [ + { + 'package': 'chromium/third_party/android_sdk/public/build-tools', + 'version': 'kwIs2vdfTm93yEP8LG5aSnchN4BVEdVxbqQtF4XpPdkC', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/cast_core/public/src': - Var('chromium_git') + '/cast_core/public' + '@' + 'fbc5e98031e1271a0a566fcd4d9092b2d3275d05', + Var('chromium_git') + '/cast_core/public' + '@' + '71f51fd6fa45fac73848f65421081edd723297cd', 'src/third_party/catapult': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), @@ -1901,7 +1238,7 @@ deps = { 'src/third_party/ced/src': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + 'ba412eaaacd3186085babcd901679a48863c7dd5', - 'src/third_party/checkstyle/cipd': { + 'src/third_party/checkstyle': { 'packages': [ { 'package': 'chromium/third_party/checkstyle', @@ -1909,7 +1246,7 @@ deps = { }, ], # Needed on Linux for use on chromium_presubmit. - 'condition': '(checkout_android or checkout_linux) and non_git_source', + 'condition': 'checkout_android or checkout_linux', 'dep_type': 'cipd', }, @@ -1925,7 +1262,7 @@ deps = { # Tools used when building Chrome for Chrome OS. This affects both the Simple # Chrome workflow, as well as the chromeos-chrome ebuild. 'src/third_party/chromite': { - 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'ba62bfc818c2958c8feae178a18545ad5f7b0305', + 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'c4b0ff08d3975d0d7a8170c2014504d81d778288', 'condition': 'checkout_chromeos', }, @@ -1939,32 +1276,42 @@ deps = { Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e', 'src/third_party/cpuinfo/src': - Var('chromium_git') + '/external/github.com/pytorch/cpuinfo.git' + '@' + 'ca156f7bc9109c552973414a63d310f76ef0cbf8', + Var('chromium_git') + '/external/github.com/pytorch/cpuinfo.git' + '@' + 'c13d0bbb266d200a13532b5915d704c30d21081b', 'src/third_party/crc32c/src': - Var('chromium_git') + '/external/github.com/google/crc32c.git' + '@' + 'd3d60ac6e0f16780bcfcc825385e1d338801a558', + Var('chromium_git') + '/external/github.com/google/crc32c.git' + '@' + 'fa5ade41ee480003d9c5af6f43567ba22e4e17e6', # For Linux and Chromium OS. 'src/third_party/cros_system_api': { - 'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '497b90c6e283745f976d783ed2beaafeef42b1bf', - 'condition': 'checkout_linux or checkout_chromeos', + 'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + 'd8500b7e0282be2e500005ddfb06c8de646ef9ee', + 'condition': 'checkout_linux', }, 'src/third_party/crossbench': Var('chromium_git') + '/crossbench.git' + '@' + Var('crossbench_revision'), + 'src/third_party/crubit/src': { + 'url': Var('chromium_git') + '/external/github.com/google/crubit.git' + '@' + Var('crubit_revision'), + 'condition': 'checkout_crubit', + }, + 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '80d1969422e75e8e9eecafa46074074b289e2568', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '3dce403ca3903542176cd6e37bcc2bd828424bb4', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), + 'src/third_party/devtools-frontend-internal': { + 'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '3ff6a880012bb45d8feff5e6d7de499729d6ff72', + 'condition': 'checkout_src_internal', + }, + 'src/third_party/dom_distiller_js/dist': Var('chromium_git') + '/chromium/dom-distiller/dist.git' + '@' + '199de96b345ada7c6e7e6ba3d2fa7a6911b8767d', 'src/third_party/eigen3/src': - Var('chromium_git') + '/external/gitlab.com/libeigen/eigen.git' + '@' + '7bb23b1e360e22a395eef75061565fc079ae6a85', + Var('chromium_git') + '/external/gitlab.com/libeigen/eigen.git' + '@' + '66e8f38891841bf88ee976a316c0c78a52f0cee5', 'src/third_party/emoji-metadata/src': { 'url': Var('chromium_git') + '/external/github.com/googlefonts/emoji-metadata' + '@' + '045f146fca682a836e01cd265171312bfb300e06', @@ -1978,16 +1325,13 @@ deps = { 'version': '5LoBT0j383h_4dXbnap7gnNQMtMjpbMJD1JaGIYNj-IC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/farmhash/src': Var('chromium_git') + '/external/github.com/google/farmhash.git' + '@' + '816a4ae622e964763ca0862d9dbd19324a1eaf45', - 'src/third_party/fast_float/src': - Var('chromium_git') + '/external/github.com/fastfloat/fast_float.git' + '@' + 'cb1d42aaa1e14b09e1452cfdef373d051b8c02a4', - 'src/third_party/ffmpeg': Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + Var('ffmpeg_revision'), @@ -1995,11 +1339,11 @@ deps = { Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '689da3a7ed50af7448c3f1961d1791c7c1d9c85c', 'src/third_party/flatbuffers/src': - Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '8db59321d9f02cdffa30126654059c7d02f70c32', + Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '28861d1d7d5ec6ce34d4bbdc10bec4aace341167', # Used for embedded builds. CrOS & Linux use the system version. 'src/third_party/fontconfig/src': { - 'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + '14d466b30a8ab4a9d789977ed94f2c30e7209267', + 'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + '2fb3419a92156569bc1ec707401258c922cd0d99', 'condition': 'checkout_linux', }, @@ -2010,7 +1354,7 @@ deps = { Var('chromium_git') + '/external/github.com/google/gemmlowp.git' + '@' + '13d57703abca3005d97b19df1f2db731607a7dc2', 'src/third_party/grpc/src': { - 'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + 'a363b6c001139b9c8ffb7cd63f60a72f15349c3b', + 'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + '822dab21d9995c5cf942476b35ca12a1aa9d2737', }, 'src/third_party/freetype/src': @@ -2025,22 +1369,6 @@ deps = { 'src/third_party/harfbuzz-ng/src': Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + Var('harfbuzz_revision'), - 'src/third_party/ink/src': - Var('chromium_git') + '/external/github.com/google/ink.git' + '@' + Var('ink_revision'), - - 'src/third_party/ink_stroke_modeler/src': - Var('chromium_git') + '/external/github.com/google/ink-stroke-modeler.git' + '@' + Var('ink_stroke_modeler_revision'), - - 'src/third_party/instrumented_libs': { - 'url': Var('chromium_git') + '/chromium/third_party/instrumented_libraries.git' + '@' + '3cc43119a29158bcde39d288a8def4b8ec49baf8', - 'condition': 'checkout_instrumented_libraries', - }, - - 'src/third_party/jszip/src': { - 'url': Var('chromium_git') + '/external/github.com/Stuk/jszip.git' + '@' + '2ceb998e29d4171b4f3f2ecab1a2195c696543c0', - 'condition': 'checkout_ios', - }, - 'src/third_party/emoji-segmenter/src': Var('chromium_git') + '/external/github.com/google/emoji-segmenter.git' + '@' + Var('emoji_segmenter_revision'), @@ -2048,45 +1376,62 @@ deps = { Var('chromium_git') + '/external/github.com/khaledhosny/ots.git' + '@' + Var('ots_revision'), 'src/third_party/libgav1/src': - Var('chromium_git') + '/codecs/libgav1.git' + '@' + 'a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd', + Var('chromium_git') + '/codecs/libgav1.git' + '@' + 'df0023cc95b8e606a2fd243522d823401ef86637', 'src/third_party/google_toolbox_for_mac/src': { 'url': Var('chromium_git') + '/external/github.com/google/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'), 'condition': 'checkout_ios or checkout_mac', }, - 'src/third_party/google-truth/src': { - 'url': Var('chromium_git') + '/external/github.com/google/truth.git' + '@' + '33387149b465f82712a817e6744847fe136949b3', + 'src/third_party/google-truth': { + 'packages': [ + { + 'package': 'chromium/third_party/google-truth', + 'version': 'u8oovXxp24lStqX4d54htRovta-75Sy2w7ijg1TL07gC', + }, + ], 'condition': 'checkout_android', + 'dep_type': 'cipd', }, 'src/third_party/googletest/src': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + Var('googletest_revision'), + # GNU binutils assembler for x86-32. + 'src/third_party/gnu_binutils': { + 'url': Var('chromium_git') + '/native_client/deps/third_party/gnu_binutils.git' + '@' + 'f4003433b61b25666565690caf3d7a7a1a4ec436', + 'condition': 'checkout_nacl and checkout_win', + }, + 'src/third_party/gperf': { 'url': Var('chromium_git') + '/chromium/deps/gperf.git' + '@' + 'd892d79f64f9449770443fb06da49b5a1e5d33c1', 'condition': 'checkout_win', }, + 'src/third_party/gvr-android-sdk/src': { + 'url': Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + '233e7fe922a543e0bc55382d64cacd047307d0e7', + 'condition': 'checkout_android', + }, + 'src/third_party/cardboard/src' : { - 'url': Var('chromium_git') + '/external/github.com/googlevr/cardboard/' + '@' + '596352df971aacede278a50f55ff1fecc4e81afc', + 'url': Var('chromium_git') + '/external/github.com/googlevr/cardboard/' + '@' + '80170209084b10860c76ea95a008875ff2a46bd4', 'condition': 'checkout_android', }, 'src/third_party/arcore-android-sdk/src': { - 'url': Var('chromium_git') + '/external/github.com/google-ar/arcore-android-sdk.git' + '@' + '80036a515b38deca1ad080b7c436856b454358f5', + 'url': Var('chromium_git') + '/external/github.com/google-ar/arcore-android-sdk.git' + '@' + 'd197af6b38f98d2344bc7f76326c4aa0c4f2fb90', 'condition': 'checkout_android', }, - 'src/third_party/arcore-android-sdk-client/cipd': { + 'src/third_party/arcore-android-sdk-client': { 'packages': [ { 'package': 'chromium/third_party/arcore-android-sdk-client', - 'version': 'gHDxvBRNpM868XTWU9SdfMqtVYTFSvK2tLRAKq4V37wC', + 'version': 'NYf1qvBS9hNVK-6exAl-MaVbQsRKCDYl5Br936GtcU0C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -2103,26 +1448,14 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/google-java-format/cipd': { - 'packages': [ - { - 'package': 'chromium/third_party/google-java-format', - 'version': 'AQn4F5NfPAs_GKX-z3OW_Q7-yJ9N6tPrDnmnDScjkTEC', - }, - ], - # Needed on Linux for use on chromium_presubmit. - 'condition': '(checkout_android or checkout_linux) and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/hamcrest/cipd': { + 'src/third_party/hamcrest': { 'packages': [ { 'package': 'chromium/third_party/hamcrest', - 'version': 'dBioOAmFJjqAr_DY7dipbXdVfAxUQwjOBNibMPtX8lQC', + 'version': '37eccfc658fe79695d6abb6dd497463c4372032f', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -2130,27 +1463,27 @@ deps = { Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e', 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'bbccc2f6efc1b825de5f2c903c48be685cd0cf22', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'de4ce0071eb47ed54cbda54869001210cf3a8ae5', - 'src/third_party/icu4j/cipd': { + 'src/third_party/icu4j': { 'packages': [ { 'package': 'chromium/third_party/icu4j', - 'version': '8dV7WRVX0tTaNNqkLEnCA_dMofr2MJXFK400E7gOFygC', + 'version': 'e87e5bed2b4935913ee26a3ebd0b723ee2344354', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/jacoco/cipd': { + 'src/third_party/jacoco': { 'packages': [ { 'package': 'chromium/third_party/jacoco', 'version': 'DWx1sUw2_F3SN9e21bI3W5vGT08eR3HQpXLZy6f-AnwC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -2159,15 +1492,15 @@ deps = { 'condition': 'checkout_android', }, - 'src/third_party/jdk/current': { + 'src/third_party/jdk': { 'packages': [ { 'package': 'chromium/third_party/jdk', - 'version': 'G-WIGWdFIBTPPhv2xPK_lTfI5N7WmfCBh0oTKqX-c5sC', + 'version': 'GCFtf5t6M4HlrHj6NXedHbpHp2xjgognF8ptNci4478C', }, ], # Needed on Linux for use on chromium_presubmit (for checkstyle). - 'condition': '(checkout_android or checkout_linux) and non_git_source', + 'condition': 'checkout_android or checkout_linux', 'dep_type': 'cipd', }, @@ -2189,18 +1522,18 @@ deps = { + '@' + '42e892d96e47b1f6e29844cc705e148ec4856448', # release 1.9.4 'src/third_party/junit/src': { - 'url': Var('chromium_git') + '/external/junit.git' + '@' + '0eb5ce72848d730da5bd6d42902fdd6a8a42055d', + 'url': Var('chromium_git') + '/external/junit.git' + '@' + '05fe2a64f59127c02135be22f416e91260d6ede6', 'condition': 'checkout_android', }, - 'src/third_party/kotlin_stdlib/cipd': { + 'src/third_party/kotlin_stdlib': { 'packages': [ { 'package': 'chromium/third_party/kotlin_stdlib', - 'version': 'rR6d6Pj-PTodfgswJ661KwgKAuHXYKAhifnuXpoo748C', + 'version': '6cGkpHi3fSRhpRfq2b1mjmzfFmShvtQe6gy4g2nFQd0C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -2208,15 +1541,15 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/kotlinc', - 'version': 'VgYl1YO2AM2qu-RYvdko61h4YtNnJeZlGWWppX7vJq8C', + 'version': 'Rr02Gf2EkaeSs3EhSUHhPqDHSd1AzimrM6cRYUJCPjQC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/leveldatabase/src': - Var('chromium_git') + '/external/leveldb.git' + '@' + '578eeb702ec0fbb6b9780f3d4147b1076630d633', + Var('chromium_git') + '/external/leveldb.git' + '@' + '068d5ee1a3ac40dabd00d211d5013af44be55bea', 'src/third_party/libFuzzer/src': Var('chromium_git') + '/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + Var('libfuzzer_revision'), @@ -2224,20 +1557,17 @@ deps = { 'src/third_party/fuzztest/src': Var('chromium_git') + '/external/github.com/google/fuzztest.git' + '@' + Var('fuzztest_revision'), - 'src/third_party/domato/src': - Var('chromium_git') + '/external/github.com/googleprojectzero/domato.git' + '@' + Var('domato_revision'), - 'src/third_party/libaddressinput/src': - Var('chromium_git') + '/external/libaddressinput.git' + '@' + '2610f7b1043d6784ada41392fc9392d1ea09ea07', + Var('chromium_git') + '/external/libaddressinput.git' + '@' + 'e8712e415627f22d0b00ebee8db99547077f39bd', 'src/third_party/libaom/source/libaom': - Var('aomedia_git') + '/aom.git' + '@' + 'd737ca3ebe92feec465876a8fc98950cecd08fd8', + Var('aomedia_git') + '/aom.git' + '@' + '00ef4ff15e3e62c50e381eb00c08d7f709226d40', 'src/third_party/libavif/src': Var('chromium_git') + '/external/github.com/AOMediaCodec/libavif.git' + '@' + Var('libavif_revision'), - 'src/third_party/crabbyavif/src': - Var('chromium_git') + '/external/github.com/webmproject/CrabbyAvif.git' + '@' + Var('crabbyavif_revision'), + 'src/third_party/libavifinfo/src': + Var('aomedia_git') + '/libavifinfo.git' + '@' + Var('libavifinfo_revision'), 'src/third_party/nearby/src': Var('chromium_git') + '/external/github.com/google/nearby-connections.git' + '@' + Var('nearby_revision'), @@ -2248,18 +1578,6 @@ deps = { 'src/third_party/securemessage/src': Var('chromium_git') + '/external/github.com/google/securemessage.git' + '@' + Var('securemessage_revision'), - 'src/third_party/speedometer/main': - Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_main_revision'), - - 'src/third_party/speedometer/v3.0': - Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_3.0_revision'), - - 'src/third_party/speedometer/v2.0': - Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_2.0_revision'), - - 'src/third_party/speedometer/v2.1': - Var('chromium_git') + '/external/github.com/WebKit/Speedometer.git' + '@' + Var('speedometer_2.1_revision'), - 'src/third_party/ukey2/src': Var('chromium_git') + '/external/github.com/google/ukey2.git' + '@' + Var('ukey2_revision'), @@ -2268,7 +1586,7 @@ deps = { # Userspace interface to kernel DRM services. 'src/third_party/libdrm/src': { - 'url': Var('chromium_git') + '/chromiumos/third_party/libdrm.git' + '@' + 'ad78bb591d02162d3b90890aa4d0a238b2a37cde', + 'url': Var('chromium_git') + '/chromiumos/third_party/libdrm.git' + '@' + '98e1db501173303e58ef6a1def94ab7a2d84afc1', 'condition': 'checkout_linux', }, @@ -2282,7 +1600,7 @@ deps = { }, 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '927aabfcd26897abb9776ecf2a6c38ea5bb52ab6', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '30bdb85e302ecfc52593636b2f44af438e05e784', 'src/third_party/liblouis/src': { 'url': Var('chromium_git') + '/external/liblouis-github.git' + '@' + '9700847afb92cb35969bdfcbbfbbb74b9c7b3376', @@ -2290,39 +1608,36 @@ deps = { }, 'src/third_party/libphonenumber/dist': - Var('chromium_git') + '/external/libphonenumber.git' + '@' + '9d46308f313f2bf8dbce1dfd4f364633ca869ca7', + Var('chromium_git') + '/external/libphonenumber.git' + '@' + '140dfeb81b753388e8a672900fb7a971e9a0d362', 'src/third_party/libprotobuf-mutator/src': Var('chromium_git') + '/external/github.com/google/libprotobuf-mutator.git' + '@' + Var('libprotobuf-mutator'), 'src/third_party/libsrtp': - Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'a52756acb1c5e133089c798736dd171567df11f5', + Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '5b7c744eb8310250ccc534f3f86a2015b3887a0a', # Android Explicit Synchronization. 'src/third_party/libsync/src': { 'url': Var('chromium_git') + '/aosp/platform/system/core/libsync.git' + '@' + 'f4f4387b6bf2387efbcfd1453af4892e8982faf6', - 'condition': 'checkout_linux or checkout_android', + 'condition': 'checkout_linux', }, 'src/third_party/libunwindstack': { - 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + 'e5061bbda4c2ba6438020669ed06b122032433dd', + 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '4dbfa0e8c844c8e243b297bc185e54a99ff94f9e', 'condition': 'checkout_android', }, - 'src/third_party/libva-fake-driver/src': - Var('chromium_git') + '/chromiumos/platform/libva-fake-driver.git' + '@' + 'a9bcab9cd6b15d4e3634ca44d5e5f7652c612194', - 'src/third_party/libvpx/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + '7a65480684b1b28bb9defae164bf0dc78b32653e', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '24c0dcc8513b8c1ba4ffbf934a399f89de646ffe', 'src/third_party/libwebm/source': - Var('chromium_git') + '/webm/libwebm.git' + '@' + '26d9f667170dc75e8d759a997bb61c64dec42dda', + Var('chromium_git') + '/webm/libwebm.git' + '@' + 'e4fbea0c9751ae8aa86629b197a28d8276a2b0da', 'src/third_party/libwebp/src': - Var('chromium_git') + '/webm/libwebp.git' + '@' + '2af6c034ac871c967e04c8c9f8bf2dbc2e271b18', + Var('chromium_git') + '/webm/libwebp.git' + '@' + 'fd7bb21c0cb56e8a82e9bfa376164b842f433f3b', 'src/third_party/libyuv': - Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '10592b60c0b2c33210b7752454253dc2625b4305', + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '04821d1e7d60845525e8db55c7bcd41ef5be9406', 'src/third_party/lighttpd': { 'url': Var('chromium_git') + '/chromium/deps/lighttpd.git' + '@' + Var('lighttpd_revision'), @@ -2338,7 +1653,7 @@ deps = { 'packages': [ { 'package': 'infra/3pp/tools/7z/${{platform}}', - 'version': 'version:3@24.09', + 'version': 'version:2@22.01', }, ], 'condition': 'checkout_win', @@ -2349,7 +1664,7 @@ deps = { 'packages': [ { 'package': 'infra/3pp/tools/7z/windows-amd64', - 'version': 'version:3@24.09', + 'version': 'version:2@22.01', }, ], 'condition': 'checkout_win', @@ -2357,7 +1672,7 @@ deps = { }, 'src/third_party/material_color_utilities/src': { - 'url': Var('chromium_git') + '/external/github.com/material-foundation/material-color-utilities.git' + '@' + '13434b50dcb64a482cc91191f8cf6151d90f5465', + 'url': Var('chromium_git') + '/external/github.com/material-foundation/material-color-utilities.git' + '@' + '234a000e507d586c20df6e3bf5b9e035bc5ce7b1', }, 'src/third_party/material_design_icons/src': { @@ -2366,11 +1681,6 @@ deps = { 'condition': 'checkout_ios', }, - 'src/third_party/microsoft_dxheaders/src': { - 'url': Var('chromium_git') + '/external/github.com/microsoft/DirectX-Headers.git' + '@' + 'd9020edfc69b789653e04fa2d8d10ee3317ffa56', - 'condition': 'checkout_win', - }, - 'src/third_party/mig/bin': { 'packages': [ { @@ -2382,19 +1692,31 @@ deps = { 'dep_type': 'cipd', }, + # GNU binutils assembler for x86-64. + 'src/third_party/mingw-w64/mingw/bin': { + 'url': Var('chromium_git') + '/native_client/deps/third_party/mingw-w64/mingw/bin.git' + '@' + '3cc8b140b883a9fe4986d12cfd46c16a093d3527', + 'condition': 'checkout_nacl and checkout_win', + }, + # Graphics buffer allocator for Chrome OS. 'src/third_party/minigbm/src': { 'url': Var('chromium_git') + '/chromiumos/platform/minigbm.git' + '@' + '3018207f4d89395cc271278fb9a6558b660885f5', 'condition': 'checkout_linux', }, + # Binaries for nacl sdk. + 'src/third_party/nacl_sdk_binaries': { + 'url': Var('chromium_git') + '/chromium/deps/nacl_sdk_binaries.git' + '@' + '759dfca03bdc774da7ecbf974f6e2b84f43699a5', + 'condition': 'checkout_nacl and checkout_win', + }, + 'src/third_party/nasm': { 'url': Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + - 'f477acb1049f5e043904b87b825c5915084a9a29' + '7fc833e889d1afda72c06220e5bed8fb43b2e5ce' }, 'src/third_party/neon_2_sse/src': - Var('chromium_git') + '/external/github.com/intel/ARM_NEON_2_x86_SSE.git' + '@' + 'eb8b80b28f956275e291ea04a7beb5ed8289e872', + Var('chromium_git') + '/external/github.com/intel/ARM_NEON_2_x86_SSE.git' + '@' + 'a15b489e1222b2087007546b4912e21293ea86ff', 'src/third_party/netty-tcnative/src': { 'url': Var('chromium_git') + '/external/netty-tcnative.git' + '@' + '035726f76293d142ec3c4464be0703605feb4d02', @@ -2409,192 +1731,56 @@ deps = { 'src/third_party/ninja': { 'packages': [ { - 'package': Var('ninja_package') + '${{platform}}', + 'package': 'infra/3pp/tools/ninja/${{platform}}', 'version': Var('ninja_version'), } ], - 'condition': 'non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/siso/cipd': { + 'src/third_party/siso': { 'packages': [ { 'package': 'infra/build/siso/${{platform}}', 'version': Var('siso_version'), } ], - 'condition': 'non_git_source', 'dep_type': 'cipd', }, + 'src/third_party/objenesis': { + 'packages': [ + { + 'package': 'chromium/third_party/objenesis', + 'version': 'tknDblENYi8IaJYyD6tUahUyHYZlzJ_Y74_QZSz4DpIC', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/openh264/src': - Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '478e5ab3eca30e600006d5a0a08b176fd34d3bd1', + Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '09a4f3ec842a8932341b195c5b01e141c8a16eb7', 'src/third_party/openscreen/src': - Var('chromium_git') + '/openscreen' + '@' + '0d00500ef556027d2fe03d4fe2bf76f26bce4887', + Var('chromium_git') + '/openscreen' + '@' + '4ec042afaf420eea2d6f2cfabfbb71b8810ea7a8', 'src/third_party/openxr/src': { - 'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '781f2eab3698d653c804ecbd11e0aed47eaad1c6', + 'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '58a00cf85c39ad5ec4dc43a769624e420c06179a', 'condition': 'checkout_openxr', }, - 'src/third_party/opus/tests/resources': { - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'bucket': 'chromium-webrtc-resources', - 'objects': [ - { - 'object_name': '009a3ee778767c2402b1d2c920bc2449265f5a2c', - 'sha256sum': '34de3161f242895a682d9cdcbbf4ad50246742b6db46873386104cfde8a24332', - 'size_bytes': 26889600, - 'generation': 1392811661954000, - 'output_file': 'speech_mono_32_48kHz.pcm', - }, - ], - }, - 'src/third_party/pdfium': Var('pdfium_git') + '/pdfium.git' + '@' + Var('pdfium_revision'), 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '943a0d89925e7f9a898c2e49c41feb9bf5dab71e', - - 'src/base/tracing/test/data': { - 'bucket': 'perfetto', - 'objects': [ - { - 'object_name': 'test_data/chrome_fcp_lcp_navigations.pftrace-ae01d849fbd75a98be1b7ddd5a8873217c377b393a1d5bbd788ed3364f7fefc3', - 'sha256sum': 'ae01d849fbd75a98be1b7ddd5a8873217c377b393a1d5bbd788ed3364f7fefc3', - 'size_bytes': 2398645, - 'generation': 1697714434866488, - 'output_file': 'chrome_fcp_lcp_navigations.pftrace' - }, - { - 'object_name': 'test_data/chrome_input_with_frame_view.pftrace-a93548822e481508c728ccc5da3ad34afcd0aec02ca7a7a4dad84ff340ee5975', - 'sha256sum': 'a93548822e481508c728ccc5da3ad34afcd0aec02ca7a7a4dad84ff340ee5975', - 'size_bytes': 6392331, - 'generation': 1711402389089075, - 'output_file': 'chrome_input_with_frame_view.pftrace' - }, - { - 'object_name': 'test_data/scroll_offsets_trace_2.pftrace-2ddd9f78d91d51e39c72c520bb54fdc9dbf1333ae722e87633fc345159296289', - 'sha256sum': '2ddd9f78d91d51e39c72c520bb54fdc9dbf1333ae722e87633fc345159296289', - 'size_bytes': 1496388, - 'generation': 1712592637141461, - 'output_file': 'scroll_offsets_trace_2.pftrace' - }, - { - 'object_name': 'test_data/top_level_java_choreographer_slices-8001e73b2458e94f65a606bb558a645ba5bca553b57fe416001f6c2175675a8a', - 'sha256sum': '8001e73b2458e94f65a606bb558a645ba5bca553b57fe416001f6c2175675a8a', - 'size_bytes': 5323017, - 'generation': 1671708979893186, - 'output_file': 'top_level_java_choreographer_slices' - }, - { - 'object_name': 'test_data/chrome_page_load_all_categories_not_extended.pftrace.gz-6586e9e2bbc0c996caddb321a0374328654983733e6ffd7f4635ac07db32a493', - 'sha256sum': '6586e9e2bbc0c996caddb321a0374328654983733e6ffd7f4635ac07db32a493', - 'size_bytes': 1277750, - 'generation': 1652442088902445, - 'output_file': 'chrome_page_load_all_categories_not_extended.pftrace.gz' - }, - { - 'object_name': 'test_data/speedometer_21.perfetto_trace.gz-8a159b354d74a3ca0d38ce9cd071ef47de322db4261ee266bfafe04d70310529', - 'sha256sum': '8a159b354d74a3ca0d38ce9cd071ef47de322db4261ee266bfafe04d70310529', - 'size_bytes': 891088, - 'generation': 1716566741068306, - 'output_file': 'speedometer_21.perfetto_trace.gz' - }, - { - 'object_name': 'test_data/speedometer_3.perfetto_trace.gz-b2c77fbe2c17363432a1ad0c05c1c1c20d3ebc62bda92c041d39918011af6f02', - 'sha256sum': 'b2c77fbe2c17363432a1ad0c05c1c1c20d3ebc62bda92c041d39918011af6f02', - 'size_bytes': 1301036, - 'generation': 1716566914245446, - 'output_file': 'speedometer_3.perfetto_trace.gz' - }, - { - 'object_name': 'test_data/scroll_jank_with_pinch.pftrace-8587d2016fdb5d39b5f852704b6e3925e9e6527af01696396be767bed04d4a45', - 'sha256sum': '8587d2016fdb5d39b5f852704b6e3925e9e6527af01696396be767bed04d4a45', - 'size_bytes': 3914720, - 'generation': 1717497788778335, - 'output_file': 'scroll_jank_with_pinch.pftrace' - }, - { - 'object_name': 'test_data/cpu_powerups_1.pb-70f5511ba0cd6ce1359e3cadb4d1d9301fb6e26be85158e3384b06f41418d386', - 'sha256sum': '70f5511ba0cd6ce1359e3cadb4d1d9301fb6e26be85158e3384b06f41418d386', - 'size_bytes': 2033064, - 'generation': 1669652389509708, - 'output_file': 'cpu_powerups_1.pb' - }, - { - 'object_name': 'test_data/chrome_5672_histograms.pftrace.gz-a09bd44078ac71bcfbc901b0544750e8344d0d0f6f96e220f700a5a53fa932ee', - 'sha256sum': 'a09bd44078ac71bcfbc901b0544750e8344d0d0f6f96e220f700a5a53fa932ee', - 'size_bytes': 1127472, - 'generation': 1684946598804577, - 'output_file': 'chrome_5672_histograms.pftrace.gz' - }, - { - 'object_name': 'test_data/chrome_custom_navigation_trace.gz-ff68279e3cec94076b69259d756eed181a63eaf834d8b956a7f4ba665fabf939', - 'sha256sum': 'ff68279e3cec94076b69259d756eed181a63eaf834d8b956a7f4ba665fabf939', - 'size_bytes': 7572484, - 'generation': 1666713705258900, - 'output_file': 'chrome_custom_navigation_trace.gz' - }, - { - 'object_name': 'test_data/scroll_offsets.pftrace-62101edb5204fec8bea30124f65d4e49bda0808d7b036e95f89445aaad6d8d98', - 'sha256sum': '62101edb5204fec8bea30124f65d4e49bda0808d7b036e95f89445aaad6d8d98', - 'size_bytes': 769741, - 'generation': 1693402148909129, - 'output_file': 'scroll_offsets.pftrace' - }, - { - 'object_name': 'test_data/chrome_input_with_frame_view_new.pftrace-e901ad9577088e62c921dd8bfcb43d652ecf49fa69b5b57f81bb3d27dbe94e12', - 'sha256sum': 'e901ad9577088e62c921dd8bfcb43d652ecf49fa69b5b57f81bb3d27dbe94e12', - 'size_bytes': 1967821, - 'generation': 1719520814352733, - 'output_file': 'chrome_input_with_frame_view_new.pftrace' - }, - { - 'object_name': 'test_data/scroll_m131.pftrace-14171c9e502a65a454f39fe14fce8b313c7012a2c14394bed496fc93b1644b0d', - 'sha256sum': '14171c9e502a65a454f39fe14fce8b313c7012a2c14394bed496fc93b1644b0d', - 'size_bytes': 1247290, - 'generation': 1729619115836875, - 'output_file': 'scroll_m131.pftrace' - }, - { - 'object_name': 'test_data/scroll_m132.pftrace-779e1fa6cab1abc0ab2dcafa4bbbf826ea8fc052878886ab168c783ca32f3bbe', - 'sha256sum': '779e1fa6cab1abc0ab2dcafa4bbbf826ea8fc052878886ab168c783ca32f3bbe', - 'size_bytes': 1854184, - 'generation': 1732117381568969, - 'output_file': 'scroll_m132.pftrace' - }, - { - 'object_name': 'test_data/scroll_m132_with_atrace.pftrace-b1fe189738a4a714cef7dd13b12318c89d6c4345fbe65096b4680ffa79f2872a', - 'sha256sum': 'b1fe189738a4a714cef7dd13b12318c89d6c4345fbe65096b4680ffa79f2872a', - 'size_bytes': 18887098, - 'generation': 1730148514067154, - 'output_file': 'scroll_m132_with_atrace.pftrace' - }, - { - 'object_name': 'test_data/scroll_with_input_not_forwarded_to_renderer.pftrace-ceb2ff3cb64c99ddb28a29867bc82f1491c4b413bfacd8638551b80936240faf', - 'sha256sum': 'ceb2ff3cb64c99ddb28a29867bc82f1491c4b413bfacd8638551b80936240faf', - 'size_bytes': 729606, - 'generation': 1732902685002882, - 'output_file': 'scroll_with_input_not_forwarded_to_renderer.pftrace' - }, - ], - 'dep_type': 'gcs' - }, + Var('android_git') + '/platform/external/perfetto.git' + '@' + 'fdaee3faea9e2e50a69eba1e3fbcf987039afc01', 'src/third_party/perl': { - 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '8ef97ff3b7332e38e61b347a2fbed425a4617151', + 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', 'condition': 'checkout_win', }, - 'src/third_party/protobuf-javascript/src': - Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + 'e34549db516f8712f678fcd4bc411613b5cc5295', - 'src/third_party/pthreadpool/src': - Var('chromium_git') + '/external/github.com/google/pthreadpool.git' + '@' + 'b4fb4eb1668c7d976cdaa941b135a02462adb460', + Var('chromium_git') + '/external/github.com/Maratyszcza/pthreadpool.git' + '@' + '1787867f6183f056420e532eec640cba25efafea', # Dependency of skia. 'src/third_party/pyelftools': { @@ -2603,7 +1789,7 @@ deps = { }, 'src/third_party/quic_trace/src': - Var('chromium_git') + '/external/github.com/google/quic-trace.git' + '@' + '413da873d93a03d3662f24b881ea459a79f9c589', + Var('chromium_git') + '/external/github.com/google/quic-trace.git' + '@' + 'caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc', 'src/third_party/pywebsocket3/src': Var('chromium_git') + '/external/github.com/GoogleChromeLabs/pywebsocket3.git' + '@' + '50602a14f1b6da17e0b619833a13addc6ea78bc2', @@ -2612,51 +1798,38 @@ deps = { 'packages': [ { 'package': 'fuchsia/third_party/qemu/linux-arm64', - 'version': 'MDf3sCxn9kct3Tg1oVRHch1hkzO6-9qZZFBRPT6jDuoC' - }, - ], - # TODO(b/351926334): Do not add `non_git_source` to this condition until the bug is fixed. - 'condition': 'host_os == "linux" and checkout_fuchsia and checkout_fuchsia_for_arm64_host', - 'dep_type': 'cipd', - }, - - 'src/third_party/edk2': { - 'packages': [ - { - 'package': 'fuchsia/third_party/edk2', - 'version': 'TfGjbhGrxzU0x2fYk8elEgwMTrvwe-3DSPTQe4gb0tMC' + 'version': 'BpnoBb2d44_SOm9toN6Lju5a2RLGAc1TPUO6xyijoP8C' }, ], - # TODO(b/351926334): Do not add `non_git_source` to this condition until the bug is fixed. 'condition': 'host_os == "linux" and checkout_fuchsia and checkout_fuchsia_for_arm64_host', 'dep_type': 'cipd', }, 'src/third_party/re2/src': - Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + '6dcd83d60f7944926bfd308cc13979fc53dd69ca', + Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + '73031bbc08cb3e3200497be4a50e37d6f3acc1d0', - 'src/third_party/r8/cipd': { + 'src/third_party/r8': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'PO3aHSPf_6XsPQhr5ej6sRCj8EXUTKutmhlFCLBeak4C', + 'version': '5fmK4ltjLHNRPbUQ34VE7o4hXrmeRbwpUTtUPadhj0wC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, # This duplication is intentional, so we avoid updating the r8.jar used by # dexing unless necessary, since each update invalidates all incremental # dexing and unnecessarily slows down all bots. - 'src/third_party/r8/d8/cipd': { + 'src/third_party/r8/d8': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'U3Jf_ewWOZyxa6vyO3wjNIgm8XIz1yFk-4k3-wqDL44C', + 'version': 'vw5kLlW3-suSlCKSO9OQpFWpR8oDnvQ8k1RgKNUapQYC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, @@ -2665,65 +1838,47 @@ deps = { 'condition': 'checkout_android', }, - 'src/third_party/robolectric/cipd': { + 'src/third_party/robolectric': { 'packages': [ { 'package': 'chromium/third_party/robolectric', - 'version': 'G3VkWqTv1YWDvC6zCrL34iQREzrzdBmSL4GMboAIiAEC', + 'version': 'hzetqh1qFI32FOgQroZvGcGdomrgVBJ6WKRnl1KFw6EC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/ruy/src': - Var('chromium_git') + '/external/github.com/google/ruy.git' + '@' + '83fd40d730feb0804fafbc2d8814bcc19a17b2e5', - - 'src/third_party/search_engines_data/resources': - Var('chromium_git') + '/external/search_engines_data.git' + '@' + '34ba850d314fced586dfaaf5b099c4906ce17b2d', + Var('chromium_git') + '/external/github.com/google/ruy.git' + '@' + 'c04e5e52ae6b144f74ac032652e3c538bda15c9b', 'src/third_party/skia': Var('skia_git') + '/skia.git' + '@' + Var('skia_revision'), 'src/third_party/smhasher/src': - Var('chromium_git') + '/external/smhasher.git' + '@' + '0ff96f7835817a27d0487325b6c16033e2992eb5', + Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', 'src/third_party/snappy/src': - Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + '32ded457c0b1fe78ceb8397632c416568d6714a0', + Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + 'c9f9edf6d75bb065fa47468bf035e051a57bec7c', 'src/third_party/sqlite/src': - Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + '567495a62a62dc013888500526e82837d727fe01', + Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + 'b7e480172bb2411f9afedefdcc69a57a12f18b7b', - 'src/third_party/sqlite4java/cipd': { + 'src/third_party/sqlite4java': { 'packages': [ { 'package': 'chromium/third_party/sqlite4java', 'version': 'LofjKH9dgXIAJhRYCPQlMFywSwxYimrfDeBmaHc-Z5EC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/subresource-filter-ruleset/data': { - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'bucket': 'chromium-ads-detection', - 'objects': [ - { - 'object_name': 'fd3ade759bd847f845fe201167de1f53e53a2275631303952f1ac4d7ab5b19dc', - 'sha256sum': 'fd3ade759bd847f845fe201167de1f53e53a2275631303952f1ac4d7ab5b19dc', - 'size_bytes': 75385, - 'generation': 1736370299437547, - 'output_file': 'UnindexedRules', - }, - ], - }, - 'src/third_party/swift-format': { 'packages': [ { - 'package': 'infra/3pp/tools/swift-format/mac-${{arch}}', + 'package': 'infra/3pp/tools/swift-format/${{platform}}', 'version': 'version:2@505.chromium.1', }, ], @@ -2745,62 +1900,37 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/test_fonts/test_fonts': { - 'dep_type': 'gcs', - 'condition': 'non_git_source', - 'bucket': 'chromium-fonts', - 'objects': [ - { - 'object_name': 'f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35', - 'sha256sum': 'f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35', - 'size_bytes': 32750602, - 'generation': 1717109450425063, - }, - ], - }, - 'src/third_party/text-fragments-polyfill/src': Var('chromium_git') + '/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git' + '@' + 'c036420683f672d685e27415de0a5f5e85bdc23f', 'src/third_party/tflite/src': - Var('chromium_git') + '/external/github.com/tensorflow/tensorflow.git' + '@' + 'b7bed6cb1d5eeebd81324b60d8bd624b9124ef5b', + Var('chromium_git') + '/external/github.com/tensorflow/tensorflow.git' + '@' + '91946956f81a2d9fd12a6d6baba20c997d3f8890', - 'src/third_party/turbine/cipd': { + 'src/third_party/turbine': { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': 'dz8pRLjwNlToJ0tS14T-TDQJNikmFXEDByMo-OzBbl0C', + 'version': 'ZlMS4BOYyYmbU8BuBDGyW7QrkvZ_-pTkm4lH4jKjTi4C', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@f840db3658c06bd08b603abbcab799b1157c3099', - 'src/third_party/glslang/src': '{chromium_git}/external/github.com/KhronosGroup/glslang@b5dc38707208efae0b7a1606790ca33d237d950e', - 'src/third_party/spirv-cross/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@b8fcf307f1f347089e3c46eb4451d27f32ebc8d3', - 'src/third_party/spirv-headers/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@2b2e05e088841c63c0b6fd4c9fb380d8688738d3', - 'src/third_party/spirv-tools/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@321692686b64873ccf4972754e36185697993e21', - 'src/third_party/vulkan-headers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@d4a196d8c84e032d27f999adcea3075517c1c97f', - 'src/third_party/vulkan-loader/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@35a851d182cdebef408493b9a82ba212d1a2629c', - 'src/third_party/vulkan-tools/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@315964ad5aabd5b148a484e5fbea8a365c8d1eb3', - 'src/third_party/vulkan-utility-libraries/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@2fe3a7791dc9c34a581dc45522ab9b4363b4f321', - 'src/third_party/vulkan-validation-layers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@a80bafccd11d2b4e44dee21c530da49b41083682', + 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@5cfecc8eccdbfb2b0d81b3ae922810b91365d68d', 'src/third_party/vulkan_memory_allocator': - Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '56300b29fbfcc693ee6609ddad3fdd5b7a449a21', - - 'src/third_party/wasm_tts_engine/src': Var('chromium_git') + '/chromium/wasm-tts-engine' + '@' + '6d5bc87a28e49361dac2964015957698b04a0df8', + Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + 'e87036508bb156f9986ea959323de1869e328f58', # Display server protocol for Linux. 'src/third_party/wayland/src': { - 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland.git' + '@' + 'a156431ea66fe67d69c9fbba8a8ad34dabbab81c', + 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland.git' + '@' + 'a8c7553ec9af6462474524fd2bb4e9a7dc7217dd', 'condition': 'checkout_linux', }, # Wayland protocols that add functionality not available in the core protocol. 'src/third_party/wayland-protocols/src': { - 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git' + '@' + '7d5a3a8b494ae44cd9651f9505e88a250082765e', + 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git' + '@' + '4624cfaaf563cd7be5e2e2087c8de6d3a48ea867', 'condition': 'checkout_linux', }, @@ -2821,30 +1951,21 @@ deps = { Var('chromium_git') + '/external/github.com/SeleniumHQ/selenium/py.git' + '@' + 'fc5e7e70c098bfb189a9a74746809ad3c5c34e04', 'src/third_party/webgl/src': - Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '450cceb587613ac1469c5a131fac15935c99e0e7', + Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '3e71f3b643f8095babbd46cf4e7d34e4f1ddf7a8', 'src/third_party/webgpu-cts/src': - Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '927348025a551f17d020789b3f31bc00de430016', - - 'src/third_party/webpagereplay': - Var('chromium_git') + '/webpagereplay.git' + '@' + Var('webpagereplay_revision'), + Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '2ee990a4cb91b41491f83b52c9520476b18a9fd8', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '9165a9b4365c101c04465af21e5943b936d854f8', + Var('webrtc_git') + '/src.git' + '@' + 'c89fdbe62490193ce7c9cbde0d39d3d622f4ed08', # Wuffs' canonical repository is at github.com/google/wuffs, but we use # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file. - # - # The local directory is called "third_party/wuffs" (matching upstream Skia - # and other non-Chromium, Skia-using projects) even though the git repo we - # clone is called "wuffs-mirror-release-c". The reasons for using w-m-r-c are - # listed in the https://crrev.com/c/3086053 commit message. One reason is - # that the w-m-r-c subset is much smaller and changes much less frequently. 'src/third_party/wuffs/src': Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + Var('wuffs_revision'), 'src/third_party/weston/src': { - 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/weston.git' + '@' + 'ccf29cb237c3ed09c5f370f35239c93d07abfdd7', + 'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/weston.git' + '@' + '420cfd00f2de91de74bd9d4d8348e43c582d29f0', 'condition': 'checkout_linux', }, @@ -2856,44 +1977,47 @@ deps = { }, 'src/third_party/xdg-utils': { - 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'cb54d9db2e535ee4ef13cc91b65a1e2741a94a44', + 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d', 'condition': 'checkout_linux', }, 'src/third_party/xnnpack/src': - Var('chromium_git') + '/external/github.com/google/XNNPACK.git' + '@' + '0824e2965f6edc2297e55c8dff5a8ac4cb12aaad', + Var('chromium_git') + '/external/github.com/google/XNNPACK.git' + '@' + 'b9d4073a6913891ce9cbd8965c8d506075d2a45a', - 'src/third_party/libei/cipd': { + 'src/tools/page_cycler/acid3': + Var('chromium_git') + '/chromium/deps/acid3.git' + '@' + 'a926d0a32e02c4c03ae95bb798e6c780e0e184ba', + + 'src/third_party/libei': { 'packages': [ { 'package': 'chromium/third_party/libei/linux-amd64', - 'version': '7V4n9OUxAo8k8zayCwZ47Bc5Mqr7Br1NXrxeMKXYBNQC', + 'version': 'PQz4zG5Q3SXoAaCYq3RK99W3wg_v0NoOu1OzTSvA_oIC', }, ], - 'condition': 'checkout_linux and non_git_source', + 'condition': 'checkout_linux', 'dep_type': 'cipd', }, 'src/third_party/zstd/src': - Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '80af41e08a630946a75a5cda9e4cdf192247f20a', + Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '25822342be59d831bad65426ae51f5cc22157b09', 'src/tools/skia_goldctl/linux': { 'packages': [ { 'package': 'skia/tools/goldctl/linux-amd64', - 'version': '1TplvrLyzA9FlWhQRWdX9SaTfuZaPdvQ9BMG0wNhy98C', + 'version': 'FdyOkAznuQ7k2iieFXsUTpz6jBaUHPGw8fNxb1-0JLMC', }, ], 'dep_type': 'cipd', - 'condition': 'checkout_linux and non_git_source', + 'condition': 'checkout_linux', }, 'src/tools/skia_goldctl/win': { 'packages': [ { 'package': 'skia/tools/goldctl/windows-amd64', - 'version': 'iu7P4Y4eMVlvfq6mCvSlP12RQuqVdmIjndnnxIbxy4IC', + 'version': '3VsnMzWsw1jy9-ZgvgPjR5emUA1IwrCNkX8xYK8oxFgC', }, ], 'dep_type': 'cipd', @@ -2904,7 +2028,7 @@ deps = { 'packages': [ { 'package': 'skia/tools/goldctl/mac-amd64', - 'version': 'i1pCGOButmwiJERJNRCcVJvvq5eJVXmgn6naqj5pIUwC', + 'version': '9RuiM5HJiEHkr27MLsTx04jOTEYQG-D_3P1BCrM03q4C', }, ], 'dep_type': 'cipd', @@ -2915,7 +2039,7 @@ deps = { 'packages': [ { 'package': 'skia/tools/goldctl/mac-arm64', - 'version': 'J_hsft9STSA1c91EbHgGONUGi_KYtolnyIbXIM_1ps8C', + 'version': 'tDNHYe-tSHHr68Th6urfIcXLngT2yJ2jCyZBQLAB5mYC', }, ], 'dep_type': 'cipd', @@ -2945,18 +2069,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/eche_app/app', - 'version': 'RN0xvjleQ3cZb_0ADjJThZ6BHBE0zBg_k95_J3T6E34C', - }, - ], - 'condition': 'checkout_chromeos and checkout_src_internal', - 'dep_type': 'cipd', - }, - - 'src/ash/webui/boca_ui/resources/prod': { - 'packages': [ - { - 'package': 'chromeos_internal/apps/boca_app/app', - 'version': 'HLx95FmliWdD09Y28e8fId9NaE9l4YjX1kNLSEch7TUC', + 'version': 'f5Rd655OB0qwwkjv7MQ4k0HK-YieLfZ04I8YiSvWHY8C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2967,7 +2080,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'uMy7vOfonOvlppmthaEbPS0Hk5Fu-VCTlEycHHlHY6IC', + 'version': 'XuDbmWI15WyT_3xdBB6Q-vxPydRh9b7Ie3qPx9f38XYC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2978,7 +2091,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': 'CqrRs-8NaEMyLsBk1WrbKynksiwxfaMLnT2fKqSH8PYC', + 'version': 'eCk59QLGrOGxZpwAC5CLdvbgcNCZ5xMUXtlVZqhGT3IC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -3011,1277 +2124,1924 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/projector_app/app', - 'version': 'I6qYL1WbVeH_3Cp8TM4r42OxK6gcYxPqjIS2IkvTFdwC', + 'version': 'm4NcX19cjuzBJmYAn-rL2tR-JK7N6E7ht6NYVPTx8lsC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', 'dep_type': 'cipd', }, - 'src/third_party/webpagereplay/cipd': { + 'src/third_party/webpagereplay': { 'packages' : [ { 'package': 'infra/tools/wpr/linux_x86_64', 'version': 'y28SfbEF6nHSkZ1eHysM1t711zpOCmtk7jUdxZB-QSMC', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/android_prebuilts/build_tools': { - 'url': Var('android_git') + '/platform/prebuilts/build-tools.git' + '@' + '3fbcdf38727f967badc13f9537bda0b4392c1f74', + 'url': Var('android_git') + '/platform/prebuilts/build-tools.git' + '@' + '673c20b524a83b662d8c1057fd3eec8fd0f93f9d', 'condition': 'checkout_android_prebuilts_build_tools', }, - # === ANDROID_DEPS Generated Code Start === - # Generated by //third_party/android_deps/fetch_all.py - 'src/third_party/android_deps/cipd/libs/com_android_support_support_annotations': { + # TODO(crbug.com/1290782): This should ideally be replaced with recursdeps, + # but that arises concern which revision of devtools-frontend we should use + # between public and internal build. So we have copy of CIPD deps from + # devtools-frontend for now here. + 'src/third_party/devtools-frontend/src/third_party/esbuild': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', - 'version': 'version:2@28.0.0.cr1', + 'package': 'infra/3pp/tools/esbuild/${{platform}}', + # This should be synced with devtools-frontend DEPS. + 'version': 'version:2@0.14.13.chromium.2', }, ], - 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_android_tools_common': { + # === ANDROID_DEPS Generated Code Start === + # Generated by //third_party/android_deps/fetch_all.py + 'src/third_party/android_deps/libs/android_arch_core_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', - 'version': 'version:2@30.2.0-beta01.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_android_tools_layoutlib_layoutlib_api': { + 'src/third_party/android_deps/libs/android_arch_core_runtime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api', - 'version': 'version:2@30.2.0-beta01.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_core_runtime', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_android_tools_sdk_common': { + 'src/third_party/android_deps/libs/android_arch_lifecycle_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', - 'version': 'version:2@30.2.0-beta01.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { + 'src/third_party/android_deps/libs/android_arch_lifecycle_common_java8': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework', - 'version': 'version:2@4.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_datatransport_transport_api': { + 'src/third_party/android_deps/libs/android_arch_lifecycle_livedata': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', - 'version': 'version:2@2.2.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth': { + 'src/third_party/android_deps/libs/android_arch_lifecycle_livedata_core': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:2@21.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata_core', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_api_phone': { + 'src/third_party/android_deps/libs/android_arch_lifecycle_runtime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:2@18.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_base': { + 'src/third_party/android_deps/libs/android_arch_lifecycle_viewmodel': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', - 'version': 'version:2@18.0.10.cr1', + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_viewmodel', + 'version': 'version:2@1.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_blockstore': { + 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_blockstore', - 'version': 'version:2@16.4.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_base': { + 'src/third_party/android_deps/libs/com_android_support_appcompat_v7': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', - 'version': 'version:2@18.5.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_basement': { + 'src/third_party/android_deps/libs/com_android_support_asynclayoutinflater': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', - 'version': 'version:2@18.5.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_asynclayoutinflater', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast': { + 'src/third_party/android_deps/libs/com_android_support_cardview_v7': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast_framework': { + 'src/third_party/android_deps/libs/com_android_support_collections': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_collections', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_clearcut': { + 'src/third_party/android_deps/libs/com_android_support_coordinatorlayout': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_coordinatorlayout', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cloud_messaging': { + 'src/third_party/android_deps/libs/com_android_support_cursoradapter': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', - 'version': 'version:2@16.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_cursoradapter', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_fido': { + 'src/third_party/android_deps/libs/com_android_support_customview': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', - 'version': 'version:2@21.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_customview', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_flags': { + 'src/third_party/android_deps/libs/com_android_support_design': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_design', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_gcm': { + 'src/third_party/android_deps/libs/com_android_support_documentfile': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_documentfile', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_identity_credentials': { + 'src/third_party/android_deps/libs/com_android_support_drawerlayout': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials', - 'version': 'version:2@16.0.0-alpha04.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_drawerlayout', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_iid': { + 'src/third_party/android_deps/libs/com_android_support_interpolator': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_interpolator', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_instantapps': { + 'src/third_party/android_deps/libs/com_android_support_loader': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', - 'version': 'version:2@18.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_loader', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_location': { + 'src/third_party/android_deps/libs/com_android_support_localbroadcastmanager': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', - 'version': 'version:2@21.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_localbroadcastmanager', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_phenotype': { + 'src/third_party/android_deps/libs/com_android_support_multidex': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex', + 'version': 'version:2@1.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_stats': { + 'src/third_party/android_deps/libs/com_android_support_print': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_print', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_tasks': { + 'src/third_party/android_deps/libs/com_android_support_recyclerview_v7': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', - 'version': 'version:2@18.2.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision': { + 'src/third_party/android_deps/libs/com_android_support_slidingpanelayout': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', - 'version': 'version:2@20.1.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_slidingpanelayout', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision_common': { + 'src/third_party/android_deps/libs/com_android_support_support_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', - 'version': 'version:2@19.1.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_libraries_identity_googleid_googleid': { + 'src/third_party/android_deps/libs/com_android_support_support_compat': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_libraries_identity_googleid_googleid', - 'version': 'version:2@1.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_material_material': { + 'src/third_party/android_deps/libs/com_android_support_support_core_ui': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', - 'version': 'version:2@1.13.0-alpha05.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_play_core_common': { + 'src/third_party/android_deps/libs/com_android_support_support_core_utils': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_common', - 'version': 'version:2@2.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_android_play_feature_delivery': { + 'src/third_party/android_deps/libs/com_android_support_support_fragment': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_feature_delivery', - 'version': 'version:2@2.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_auto_service_auto_service_annotations': { + 'src/third_party/android_deps/libs/com_android_support_support_media_compat': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', - 'version': 'version:2@1.0-rc6.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_auto_value_auto_value_annotations': { + 'src/third_party/android_deps/libs/com_android_support_support_v4': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', - 'version': 'version:2@1.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_code_findbugs_jsr305': { + 'src/third_party/android_deps/libs/com_android_support_support_vector_drawable': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', - 'version': 'version:2@3.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_code_gson_gson': { + 'src/third_party/android_deps/libs/com_android_support_swiperefreshlayout': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', - 'version': 'version:2@2.8.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_swiperefreshlayout', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_dagger_dagger': { + 'src/third_party/android_deps/libs/com_android_support_transition': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', - 'version': 'version:2@2.52.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_transition', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotations': { + 'src/third_party/android_deps/libs/com_android_support_versionedparcelable': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2@2.30.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_versionedparcelable', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_annotations': { + 'src/third_party/android_deps/libs/com_android_support_viewpager': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', - 'version': 'version:2@16.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager', + 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_common': { + 'src/third_party/android_deps/libs/com_android_tools_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', - 'version': 'version:2@19.5.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', + 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_components': { + 'src/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', - 'version': 'version:2@16.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api', + 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders': { + 'src/third_party/android_deps/libs/com_android_tools_sdk_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', - 'version': 'version:2@16.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', + 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders_json': { + 'src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', - 'version': 'version:2@17.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', + 'version': 'version:2@2.8.8.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid': { + 'src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', - 'version': 'version:2@21.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', + 'version': 'version:2@1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid_interop': { + 'src/third_party/android_deps/libs/com_google_android_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', - 'version': 'version:2@17.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_annotations', + 'version': 'version:2@4.1.1.4.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations': { + 'src/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', - 'version': 'version:2@16.3.5.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework', + 'version': 'version:2@4.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations_interop': { + 'src/third_party/android_deps/libs/com_google_android_datatransport_transport_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', - 'version': 'version:2@16.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', + 'version': 'version:2@2.2.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_measurement_connector': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', - 'version': 'version:2@18.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', + 'version': 'version:2@20.1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_messaging': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', - 'version': 'version:2@21.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', + 'version': 'version:2@18.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_guava_failureaccess': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', - 'version': 'version:2@1.0.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', + 'version': 'version:2@18.0.2.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_guava_guava': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_base': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', - 'version': 'version:2@33.3.1-jre.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', + 'version': 'version:2@18.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_guava_guava_android': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_basement': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', - 'version': 'version:2@33.3.1-android.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', + 'version': 'version:2@18.1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_j2objc_j2objc_annotations': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', - 'version': 'version:2@3.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_javalite': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:2@4.28.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_testparameterinjector_test_parameter_injector': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_testparameterinjector_test_parameter_injector', - 'version': 'version:2@1.18.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_googlecode_java_diff_utils_diffutils': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', - 'version': 'version:2@1.3.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', + 'version': 'version:2@16.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_javapoet': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_flags': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', - 'version': 'version:2@1.13.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_javawriter': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', - 'version': 'version:2@2.1.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_iid': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_moshi_moshi', - 'version': 'version:2@1.15.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi_adapters': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_moshi_moshi_adapters', - 'version': 'version:2@1.15.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', + 'version': 'version:2@18.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_okio_okio_jvm': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_location': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_okio_okio_jvm', - 'version': 'version:2@3.9.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', + 'version': 'version:2@19.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_wire_wire_runtime_jvm': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm', - 'version': 'version:2@5.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/jakarta_inject_jakarta_inject_api': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/jakarta_inject_jakarta_inject_api', - 'version': 'version:2@2.0.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/javax_annotation_javax_annotation_api': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_stats': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', - 'version': 'version:2@1.3.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/javax_annotation_jsr250_api': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', - 'version': 'version:2@1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', + 'version': 'version:2@18.0.2.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/javax_inject_javax_inject': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', - 'version': 'version:2@1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', + 'version': 'version:2@20.1.3.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy': { + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy', - 'version': 'version:2@1.14.12.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', + 'version': 'version:2@19.1.3.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy_agent': { + 'src/third_party/android_deps/libs/com_google_android_material_material': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent', - 'version': 'version:2@1.14.12.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', + 'version': 'version:2@1.7.0-alpha02.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_bouncycastle_bcprov_jdk18on': { + 'src/third_party/android_deps/libs/com_google_android_play_core_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on', - 'version': 'version:2@1.78.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_common', + 'version': 'version:2@2.0.2.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_ccil_cowan_tagsoup_tagsoup': { + 'src/third_party/android_deps/libs/com_google_android_play_feature_delivery': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', - 'version': 'version:2@1.2.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_feature_delivery', + 'version': 'version:2@2.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_compat_qual': { + 'src/third_party/android_deps/libs/com_google_auto_auto_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', - 'version': 'version:2@2.5.5.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', + 'version': 'version:2@1.2.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_qual': { + 'src/third_party/android_deps/libs/com_google_auto_service_auto_service': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', - 'version': 'version:2@3.43.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', + 'version': 'version:2@1.0-rc6.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_util': { + 'src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_util', - 'version': 'version:2@3.25.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', + 'version': 'version:2@1.0-rc6.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', - 'version': 'version:2@1.17.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', + 'version': 'version:2@1.10.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_conscrypt_conscrypt_openjdk_uber': { + 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber', - 'version': 'version:2@2.5.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', + 'version': 'version:2@3.0.2.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_hamcrest_hamcrest': { + 'src/third_party/android_deps/libs/com_google_code_gson_gson': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_hamcrest_hamcrest', - 'version': 'version:2@2.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', + 'version': 'version:2@2.9.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime': { + 'src/third_party/android_deps/libs/com_google_dagger_dagger': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime', - 'version': 'version:2@1.9.22.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', + 'version': 'version:2@2.30.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime': { + 'src/third_party/android_deps/libs/com_google_dagger_dagger_compiler': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime', - 'version': 'version:2@1.9.22.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', + 'version': 'version:2@2.30.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_atomicfu_jvm': { + 'src/third_party/android_deps/libs/com_google_dagger_dagger_producers': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm', - 'version': 'version:2@0.23.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', + 'version': 'version:2@2.30.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': { + 'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android', - 'version': 'version:2@1.8.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', + 'version': 'version:2@2.30.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': { + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', - 'version': 'version:2@1.8.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', + 'version': 'version:2@2.11.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava': { + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava', - 'version': 'version:2@1.8.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', + 'version': 'version:2@2.18.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm': { + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm', - 'version': 'version:2@1.7.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', + 'version': 'version:2@2.11.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm': { + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_core': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm', - 'version': 'version:2@1.7.2.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', + 'version': 'version:2@2.11.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jsoup_jsoup': { + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jsoup_jsoup', - 'version': 'version:2@1.15.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', + 'version': 'version:2@2.11.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_jspecify_jspecify': { + 'src/third_party/android_deps/libs/com_google_errorprone_javac': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jspecify_jspecify', - 'version': 'version:2@1.0.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', + 'version': 'version:2@9+181-r4173-1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_android': { + 'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_android', - 'version': 'version:2@5.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', + 'version': 'version:2@9-dev-r4023-3.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_core': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_core', - 'version': 'version:2@5.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', + 'version': 'version:2@16.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_subclass': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_common': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_subclass', - 'version': 'version:2@5.11.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', + 'version': 'version:2@19.5.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_objenesis_objenesis': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_components': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_objenesis_objenesis', - 'version': 'version:2@3.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', + 'version': 'version:2@16.1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', - 'version': 'version:2@9.7.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', + 'version': 'version:2@16.1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_analysis': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', - 'version': 'version:2@9.7.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', + 'version': 'version:2@17.1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_commons': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', - 'version': 'version:2@9.7.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', + 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_tree': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', - 'version': 'version:2@9.7.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', + 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_util': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', - 'version': 'version:2@9.7.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', + 'version': 'version:2@16.3.5.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_annotations': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', + 'version': 'version:2@16.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_junit': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', + 'version': 'version:2@18.0.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime': { + 'src/third_party/android_deps/libs/com_google_firebase_firebase_messaging': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', + 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime_dist_compat': { + 'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat', - 'version': 'version:2@1.0.16.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', + 'version': 'version:2@1.5.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_pluginapi': { + 'src/third_party/android_deps/libs/com_google_guava_failureaccess': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', + 'version': 'version:2@1.0.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_plugins_maven_dependency_resolver': { + 'src/third_party/android_deps/libs/com_google_guava_guava': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', + 'version': 'version:2@31.1-jre.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_resources': { + 'src/third_party/android_deps/libs/com_google_guava_guava_android': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', + 'version': 'version:2@31.1-android.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_robolectric': { + 'src/third_party/android_deps/libs/com_google_guava_listenablefuture': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture', + 'version': 'version:2@1.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_sandbox': { + 'src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', + 'version': 'version:2@1.3.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_shadowapi': { + 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_java': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java', + 'version': 'version:2@3.19.2.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_shadows_framework': { + 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', + 'version': 'version:2@3.21.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_utils': { + 'src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', + 'version': 'version:2@1.3.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_robolectric_utils_reflector': { + 'src/third_party/android_deps/libs/com_squareup_javapoet': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', - 'version': 'version:2@4.14.1.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', + 'version': 'version:2@1.13.0.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_yaml_snakeyaml': { + 'src/third_party/android_deps/libs/com_squareup_javawriter': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_yaml_snakeyaml', - 'version': 'version:2@2.3.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', + 'version': 'version:2@2.1.1.cr1', }, ], - 'condition': 'checkout_android and non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - # === ANDROID_DEPS Generated Code End === - - 'src/tools/resultdb': { + 'src/third_party/android_deps/libs/com_squareup_okio_okio_jvm': { 'packages': [ - { - 'package': 'infra/tools/result_adapter/${{platform}}', - 'version': Var('resultdb_version'), - }, + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_okio_okio_jvm', + 'version': 'version:2@3.3.0.cr1', + }, ], - 'condition': 'non_git_source', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, - # Dependencies from src_internal - 'src/chromeos/ash/resources/internal': { - 'url': Var('chrome_git') + '/chrome/chromeos/ash/resources/internal.git' + '@' + - 'dd3d2b0c1e780a13f6716cdbd20b2489811f0218', - 'condition': 'checkout_src_internal and checkout_chromeos', + 'src/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm', + 'version': 'version:2@4.7.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', }, - 'src/chromeos/assistant/internal': { + 'src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils', + 'version': 'version:2@4.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_api', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_binder': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_binder', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_context': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_context', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_core', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_stub': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_stub', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_perfmark_perfmark_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_perfmark_perfmark_api', + 'version': 'version:2@0.25.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', + 'version': 'version:2@1.3.2.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/javax_annotation_jsr250_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', + 'version': 'version:2@1.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/javax_inject_javax_inject': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', + 'version': 'version:2@1.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/net_bytebuddy_byte_buddy': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy', + 'version': 'version:2@1.14.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent', + 'version': 'version:2@1.14.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/net_ltgt_gradle_incap_incap', + 'version': 'version:2@0.2.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on', + 'version': 'version:2@1.72.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', + 'version': 'version:2@1.2.1.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', + 'version': 'version:2@2.5.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_checkerframework_checker_qual': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', + 'version': 'version:2@3.25.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_checkerframework_checker_util': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_util', + 'version': 'version:2@3.25.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone', + 'version': 'version:2@3.15.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', + 'version': 'version:2@1.21.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber', + 'version': 'version:2@2.5.2.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit', + 'version': 'version:2@4.4.1.201607150455-r.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_hamcrest_hamcrest': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_hamcrest_hamcrest', + 'version': 'version:2@2.2.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7', + 'version': 'version:2@1.8.20.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8', + 'version': 'version:2@1.8.20.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android', + 'version': 'version:2@1.6.4.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', + 'version': 'version:2@1.6.4.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava', + 'version': 'version:2@1.6.4.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm', + 'version': 'version:2@0.1.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jsoup_jsoup': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jsoup_jsoup', + 'version': 'version:2@1.15.1.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_mockito_mockito_android': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_android', + 'version': 'version:2@5.4.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_mockito_mockito_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_core', + 'version': 'version:2@5.4.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_mockito_mockito_subclass': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_subclass', + 'version': 'version:2@5.4.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_objenesis_objenesis': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_objenesis_objenesis', + 'version': 'version:2@3.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', + 'version': 'version:2@9.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_analysis': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', + 'version': 'version:2@9.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_commons': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', + 'version': 'version:2@9.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_tree': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', + 'version': 'version:2@9.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_util': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', + 'version': 'version:2@9.5.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_pcollections_pcollections': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', + 'version': 'version:2@3.1.4.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_junit': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_nativeruntime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat', + 'version': 'version:2@1.0.1.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_pluginapi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_resources': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_robolectric': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_sandbox': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_shadowapi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_shadows_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_shadows_playservices': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_utils_reflector': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', + 'version': 'version:2@4.10.3.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + # === ANDROID_DEPS Generated Code End === + + 'src/tools/resultdb': { + 'packages': [ + { + 'package': 'infra/tools/result_adapter/${{platform}}', + 'version': Var('resultdb_version'), + }, + ], + 'dep_type': 'cipd', + }, + + 'src/tools/bazel/linux-amd64': { + 'packages': [{ + 'package': 'infra/3pp/tools/bazel_bootstrap/linux-amd64', + 'version': 'version:2@5.3.2.1', + }], + 'dep_type': 'cipd', + 'condition': 'host_os == "linux" and checkout_bazel', + }, + + 'src/tools/bazel/mac-amd64': { + 'packages': [{ + 'package': 'infra/3pp/tools/bazel_bootstrap/mac-amd64', + 'version': 'version:2@5.3.2.1', + }], + 'dep_type': 'cipd', + 'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_bazel', + }, + + 'src/tools/bazel/mac-arm64': { + 'packages': [{ + 'package': 'infra/3pp/tools/bazel_bootstrap/mac-arm64', + 'version': 'version:2@5.3.2.1', + }], + 'dep_type': 'cipd', + 'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_bazel', + }, + + 'src/tools/bazel/windows-amd64': { + 'packages': [{ + 'package': 'infra/3pp/tools/bazel_bootstrap/windows-amd64', + 'version': 'version:2@5.3.2', + }], + 'dep_type': 'cipd', + 'condition': 'host_os == "win" and checkout_bazel', + }, + + # Dependencies from src_internal + 'src/chromeos/assistant/internal': { 'url': Var('chrome_git') + '/chrome/assistant.git' + '@' + - '366dc486f8f18d097f22acb469b8eab41b14c9ad', + 'be573fb2c5ba762c5100c39b4b57baeec0877c65', 'condition': 'checkout_src_internal and checkout_chromeos', }, 'src/ui/gl/resources/angle-metal': { 'packages': [{ 'package': 'chromium/gpu/angle-metal-shader-libraries', - 'version': 'S0FPOVKrgaiqyuR20SSHiPorLgYez29bfwEdKBobUMMC', + 'version': 'aeUpC6kkTbhimw4m_7ricveccDcAXfa8H5ww_LGerdYC', }], 'dep_type': 'cipd', 'condition': 'checkout_mac or checkout_ios', }, - 'src/buildtools/android/doclava': { - 'dep_type': 'gcs', - 'bucket': 'chromium-doclava', - 'condition': 'checkout_android and non_git_source', - 'objects': [ - { - 'object_name': '1931becb8a8e21685f39c62854e9e814d64ccf1a', - 'sha256sum': '935a602c0dda7f769fc48fc777697ea23ccead170fbc70d2d41af5713ef50bbf', - 'size_bytes': 3517760, - 'generation': 1516199210583319, - }, - ], - }, # Repositories from src_internal 'src/build/fuchsia/internal': { 'url': Var('chrome_git') + '/fuchsia/build.git' + '@' + @@ -4291,19 +4051,19 @@ deps = { 'src/chrome/app/theme/default_100_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/theme/default_100_percent/google_chrome.git' + '@' + - 'c5fa2fa6eebebdd7a8f6886cff6968b59b63284f', + '364a7bfc4cec1e32257a2b9ae12f5354fa4709bb', 'condition': 'checkout_src_internal', }, 'src/chrome/app/theme/default_200_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/theme/default_200_percent/google_chrome.git' + '@' + - '323e8f4ce9be0212708cce6b765a632a1a9d824c', + '422d4257f3f9f3c2f6b03d8033c61f0cbbece8b4', 'condition': 'checkout_src_internal', }, 'src/chrome/app/theme/google_chrome': { 'url': Var('chrome_git') + '/chrome/theme/google_chrome.git' + '@' + - '1d807d1b5ffc29e13e3c05260ce8a44401e3582d', + 'fd5f28534a5255022dd9cee6915e76755f87cc2f', 'condition': 'checkout_src_internal', }, @@ -4321,7 +4081,7 @@ deps = { 'src/chrome/browser/internal': { 'url': Var('chrome_git') + '/chrome/browser_internal.git' + '@' + - '5649dd0237ac7f75c2779ff757e8666bdb9d2674', + 'e7e78db02b503924ba5047b3b211ff1846be8335', 'condition': 'checkout_src_internal', }, @@ -4331,33 +4091,15 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/chrome/browser/nearby_sharing/internal': { - 'url': Var('chrome_git') + '/chrome/browser/nearby_sharing/internal.git' + '@' + - '5fe4183de2df3467add81f4610f79ea1dde41a48', - 'condition': 'checkout_src_internal', - }, - - 'src/chrome/browser/platform_experience/win': { - 'url': Var('chrome_git') + '/chrome/browser/platform_experience/win.git' + '@' + - '4d37f316b79229e3ec9e021f6e7590f190dd0134', - 'condition': 'checkout_src_internal', - }, - - 'src/chrome/browser/request_header_integrity/internal': { - 'url': Var('chrome_git') + '/chrome/browser/request_header_integrity/internal.git' + '@' + - '1592aa7ba598a048f918f54735bcf056556532c3', - 'condition': 'checkout_src_internal', - }, - - 'src/chrome/browser/resources/downloads/internal': { - 'url': Var('chrome_git') + '/chrome/browser/resources/downloads_internal.git' + '@' + - '4fefb8a24ae6c421f640b9ef028e4b4ca75df729', - 'condition': 'checkout_src_internal', + 'src/chrome/browser/resources/chromeos/quickoffice': { + 'url': Var('chrome_git') + '/quickoffice/crx.git' + '@' + + '23bde3495989fbc0112213613d2498030be51417', + 'condition': '(checkout_chromeos or checkout_linux) and checkout_src_internal', }, - 'src/chrome/browser/resources/settings/internal': { + 'src/chrome/browser/resources/settings_internal': { 'url': Var('chrome_git') + '/chrome/browser/resources/settings_internal.git' + '@' + - 'bc502cc43fa3999514c63c96aa75239c9d1acf91', # from svn revision 41419 + '5d6316b2434986e6b073e1d24585578bb27da451', # from svn revision 41419 'condition': 'checkout_src_internal', }, @@ -4367,39 +4109,17 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/chrome/browser/resources/chromeos/mako/resources': { - 'packages' : [ - { - 'package': 'chromeos_internal/inputs/orca', - 'version': 'u9vK3nIWSWZ0y9DalJGOfXqsbdZOBq4nZCLO3fc6tc0C' - } - ], - 'condition': 'checkout_chromeos and checkout_src_internal', - 'dep_type': 'cipd', - }, - - 'src/chrome/browser/resources/chromeos/seal/resources': { - 'packages' : [ - { - 'package': 'chromeos_internal/inputs/seal', - 'version': '11AdGL1RBEo2LflLT5Vc8Q3vBfjsHQAuH5jAhUBxL9QC' - } - ], - 'condition': 'checkout_chromeos and checkout_src_internal', - 'dep_type': 'cipd', - }, - - 'src/chrome/elevation_service/internal': { - 'url': Var('chrome_git') + '/chrome/elevation_service/internal.git' + '@' + - 'c13ff6fa7c879977a9c92e1d753164f4119e41e1', - 'condition': 'checkout_src_internal and checkout_win', + 'src/chrome/chrome_cleaner/internal': { + 'url': Var('chrome_git') + '/protector/foil.git' + '@' + + 'f7839edf1403546f1ebc5bff62319d32e21529ab', + 'condition': 'checkout_chrome_cleaner_internal and checkout_src_internal', }, # Installer bits used only by Mac, but mapped for all OSes to ease source # grepping. 'src/chrome/installer/mac/internal': { 'url': Var('chrome_git') + '/chrome/installer/mac/internal.git' + '@' + - '85c282fe6f2763822964028cb89be7b808b07169', + 'd7fb448e1fc84c05c40719d83d785fe2a131e616', 'condition': 'checkout_src_internal', }, @@ -4445,6 +4165,12 @@ deps = { 'condition': 'checkout_src_internal', }, + 'src/chrome/test/python_tests': { + 'url': Var('chrome_git') + '/chrome/test/python_tests.git' + '@' + + '644bd7703b85f148564cc4038aada81f3a616d8a', + 'condition': 'checkout_src_internal', + }, + 'src/chrome/tools/memory': { 'url': Var('chrome_git') + '/chrome/tools/memory.git' + '@' + '3c9359382236f6d57c91505234a2bc7fd635ba6c', @@ -4452,25 +4178,13 @@ deps = { }, 'src/chrome/services/speech/internal': { - 'url': Var('chrome_git') + '/chromeos/speech.git' + '@' + '917c83b7c79126906c5d19668256b9d9139a0e71', + 'url': Var('chrome_git') + '/chromeos/speech.git' + '@' + 'ae04dd0dae0a673d33c29bbe84405932d77e14fc', 'condition': 'checkout_chromeos and checkout_src_internal', }, - 'src/chrome/updater/internal': { - 'url': Var('chrome_git') + '/chrome/updater/internal.git' + '@' + - '2156fafa6a12ebd5c6388aabf8e149d8e50f5ed5', - 'condition': 'checkout_src_internal', - }, - - 'src/components/accessibility/internal': { - 'url': Var('chrome_git') + '/chrome-accessibility.git' + '@' + - '2e6c405fd5f09ad9d8933bc531af8c5dd24f348c', - 'condition': 'checkout_src_internal', - }, - 'src/components/autofill/core/browser/form_parsing/internal_resources': { 'url': Var('chrome_git') + '/chrome/components/autofill_regex_patterns.git' + '@' + - 'd74d93ad9bc077c106419510e7aa08fa5d618cf1', + '8d5b9c6b4200e59297bb32f8cca01d7564eb259b', 'condition': 'checkout_src_internal', }, @@ -4481,7 +4195,7 @@ deps = { 'src/components/metrics/internal': { 'url': Var('chrome_git') + '/chrome/components/metrics/internal.git' + '@' + - 'b142ab0612763d64d3ec3b79cd71c6dc9bcbe20b', + 'ac51808a082f35a97395ebb49c74dca809bd7540', 'condition': 'checkout_src_internal', }, @@ -4493,31 +4207,25 @@ deps = { 'src/components/optimization_guide/internal': { 'url': Var('chrome_git') + '/chrome/components/optimization_guide.git' + '@' + - '53245c50e8faa652c12a9dc5bda2228d22f03f68', - 'condition': 'checkout_src_internal', - }, - - 'src/components/plus_addresses/resources/internal': { - 'url': Var('chrome_git') + '/chrome/components/plus_addresses/resources.git' + '@' + - 'e73efc6aae32e7a580170cf34cbbea6bf1a6b7ce', + '3603f882504d9a8785fc8e3869ccdf4cc7394314', 'condition': 'checkout_src_internal', }, 'src/components/resources/default_100_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/components/default_100_percent/google_chrome.git' + '@' + - 'e147db95eb4f7baa20207a513485e019af0e18bb', + '459263268c478eeb63e788074eb251eabe9bc385', 'condition': 'checkout_src_internal', }, 'src/components/resources/default_200_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/components/default_200_percent/google_chrome.git' + '@' + - '22f067172eb11f6b7191aa1ec1aec38b0045839b', + '66e7e3c423b0a795a3706ab63d3e9adfd8c5a646', 'condition': 'checkout_src_internal', }, 'src/components/resources/default_300_percent/google_chrome': { 'url': Var('chrome_git') + '/chrome/components/default_300_percent/google_chrome.git' + '@' + - 'd01fae2b485ce5571b9d2e9d766cbbda687c21ad', + '91bb3da51c938685b899b3bd8a5ba0dda86bb861', 'condition': 'checkout_src_internal', }, @@ -4527,21 +4235,9 @@ deps = { 'condition': 'checkout_src_internal', }, - 'src/components/test/data/autofill/heuristics-json/internal': { - 'url': Var('chrome_git') + '/chrome/test/autofill/structured_forms.git' + '@' + - '868d3dca11f4ecca239de85e60f46de0b10ad106', - 'condition': 'checkout_chromium_autofill_test_dependencies', - }, - - 'src/components/test/data/autofill/label-doms/internal': { - 'url': Var('chrome_git') + '/chrome/test/autofill/field_labels.git' + '@' + - 'c67083dbb39d4bd87d86c083fecbe35aa562c777', - 'condition': 'checkout_chromium_autofill_test_dependencies', - }, - 'src/components/vector_icons/google_chrome': { 'url': Var('chrome_git') + '/chrome/vector_icons/google_chrome.git' + '@' + - 'ecad7931572c1f673bf582b785838daadbaadfab', + 'dbf059ca9ed5a4da6ae628042a2797e822a53d79', 'condition': 'checkout_src_internal', }, @@ -4553,16 +4249,22 @@ deps = { 'src/google_apis/internal': { 'url': Var('chrome_git') + '/chrome/google_apis/internal.git' + '@' + - '7a37593e294ec4baa40e12505722a792940399ff', + '1f0b7eaee8e77a00988d3af8d1647ba9cca9965c', 'condition': 'checkout_src_internal', }, 'src/ios_internal': { 'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' + - '2d258da4b8b08c065c59c2a42b16a0c29d3484b3', + '6a51cc6934837120dc3cd3eab35e745cc8950e8e', 'condition': 'checkout_ios and checkout_src_internal', }, + 'src/remoting/android/internal': { + 'url': Var('chrome_git') + '/chrome/remoting/android/internal.git' + '@' + + 'd4b268b20d45eeb46d9c7cb2b9d88f921254fdae', + 'condition': 'checkout_android and checkout_src_internal', + }, + 'src/remoting/host/installer/linux/internal': { 'url': Var('chrome_git') + '/chrome/remoting/host/installer/linux/internal.git' + '@' + 'e190816de75b14897f1af785eb37d237750460e2', @@ -4570,8 +4272,8 @@ deps = { }, 'src/remoting/internal': { - 'url': Var('chrome_git') + '/chrome/remoting/internal.git' + '@' + - 'f4b7da7fe40499ad775d1b2a730f4cd1de4ac05c', + 'url': Var('chrome_git') + '/chrome/app-streaming.git' + '@' + + 'd4e99ab2c43b3301e1d3ba88a7cfccd93511c8b0', 'condition': 'checkout_src_internal', }, @@ -4584,135 +4286,57 @@ deps = { 'src/remoting/tools/internal': { 'url': Var('chrome_git') + '/chrome/remoting/tools/internal.git' + '@' + 'acfed9c3a363694f37aadfb5cda4c31109661eb8', - 'condition': 'checkout_src_internal', - }, - - 'src/signing_keys': { - 'url': Var('chrome_git') + '/clank/apptestkey.git' + '@' + - '5138e684915721cbccbb487ec0764ed05650fcd0', - 'condition': 'checkout_android and checkout_google_internal and checkout_src_internal', - }, - - 'src/skia/tools/clusterfuzz-data':{ - 'url': Var('chrome_git') + '/chrome/tools/clusterfuzz-data.git' + '@' + - 'fa1fc4acacddd8d655cfca0bcadef5f7e2259bed', - 'condition': 'checkout_clusterfuzz_data and checkout_src_internal', - }, - - 'src/third_party/android_tools_internal': { - 'url': Var('chrome_git') + '/clank/third_party/android_tools.git' + '@' + - 'ab59dfd133386420a319a194c9ac6f5cae802471', - 'condition': 'checkout_android and checkout_src_internal', - }, - - 'src/third_party/libassistant/x64': { - 'packages': [ - { - 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_device/x86_64/internal', - 'version': 'CmuG4T_84hgqYyVPLppHO_cYpXPoYIFpJNT5wC5iGZgC', - }, - ], - 'condition': 'checkout_src_internal and checkout_chromeos', - 'dep_type': 'cipd', - }, - - 'src/third_party/libassistant/arm64': { - 'packages': [ - { - 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_device/arm64/internal', - 'version': '0gwaQvw-4Jne1dvCdVsGRVHcADdvSLBy172ar-FFyIoC', - }, - ], - 'condition': 'checkout_src_internal and checkout_chromeos', - 'dep_type': 'cipd', + 'condition': 'checkout_src_internal', }, - 'src/third_party/libassistant/arm': { - 'packages': [ - { - 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_device/arm/internal', - 'version': 'bLW45XE7O8kCndjxEYtqdupr0tV4mgB7xKkcETBOsskC', - }, - ], - 'condition': 'checkout_src_internal and checkout_chromeos', - 'dep_type': 'cipd', + 'src/remoting/webapp/app_remoting/internal': { + 'url': Var('chrome_git') + '/chrome/remoting/webapp/app_remoting/internal.git' + '@' + + '5ad5339af97c3bd193d595de03f34282491ce495', + 'condition': 'checkout_src_internal', }, - 'src/third_party/libassistant/glinux': { - 'packages': [ - { - 'package': 'chromeos_internal/assistant/libassistant/libassistant_cros_glinux/x64/internal', - 'version': '3Opw5sw239P8B6hdZCofFV_16gGsW5nJbuoA93doiAkC', - }, - ], - 'condition': 'checkout_src_internal and checkout_chromeos', - 'dep_type': 'cipd', + 'src/signing_keys': { + 'url': Var('chrome_git') + '/clank/apptestkey.git' + '@' + + '5138e684915721cbccbb487ec0764ed05650fcd0', + 'condition': 'checkout_android and checkout_google_internal and checkout_src_internal', }, - 'src/third_party/libassistant/fake_s3_server': { - 'packages': [ - { - 'package': 'chromeos_internal/assistant/libassistant/fake_s3_server_cros_glinux/x64/internal', - 'version': '7BVkGvAvW0XDvbHj3P4-e6TAxssx6_PC2L0eQBLWyP8C', - }, - ], - 'condition': 'checkout_src_internal and checkout_chromeos', - 'dep_type': 'cipd', + 'src/skia/tools/clusterfuzz-data':{ + 'url': Var('chrome_git') + '/chrome/tools/clusterfuzz-data.git' + '@' + + 'fa1fc4acacddd8d655cfca0bcadef5f7e2259bed', + 'condition': 'checkout_clusterfuzz_data and checkout_src_internal', }, - 'src/third_party/screen-ai/linux': { - 'packages': [ - { - 'package': 'chromium/third_party/screen-ai/linux', - 'version': Var('screen_ai_linux'), - }, - ], - 'condition': 'checkout_linux and non_git_source', - 'dep_type': 'cipd', + 'src/third_party/amd': { + 'url': Var('chrome_git') + '/chrome/deps/amd.git' + '@' + + 'cbd9811acb6d09f19b880fdbc6f0fc62901c9a5c', + 'condition': 'checkout_win and checkout_src_internal', }, - 'src/third_party/screen-ai/macos_amd64': { - 'packages': [ - { - 'package': 'chromium/third_party/screen-ai/mac-amd64', - 'version': Var('screen_ai_macos_amd64'), - }, - ], - 'condition': 'checkout_mac', - 'dep_type': 'cipd', + 'src/third_party/android_tools_internal': { + 'url': Var('chrome_git') + '/clank/third_party/android_tools.git' + '@' + + 'ab59dfd133386420a319a194c9ac6f5cae802471', + 'condition': 'checkout_android and checkout_src_internal', }, - 'src/third_party/screen-ai/macos_arm64': { - 'packages': [ - { - 'package': 'chromium/third_party/screen-ai/mac-arm64', - 'version': Var('screen_ai_macos_arm64'), - }, - ], - 'condition': 'checkout_mac', - 'dep_type': 'cipd', + # OpenGL ES 2.0 Conformance tests. + 'src/third_party/gles2_conform': { + 'url': Var('chrome_git') + '/chrome/deps/gles2_conform.git' + '@' + + '57738bb2cc672cb81ed2ee287fcd0defde968811', + 'condition': 'checkout_src_internal', }, - 'src/third_party/screen-ai/windows_amd64': { - 'packages': [ - { - 'package': 'chromium/third_party/screen-ai/windows-amd64', - 'version': Var('screen_ai_windows_amd64'), - }, - ], - 'condition': 'checkout_win', - 'dep_type': 'cipd', + 'src/third_party/googlemac': { + 'url': Var('chrome_git') + '/chrome/deps/googlemac.git' + '@' + + '6ae4175fcf9e37655c5d7c3a7482dfc7436281d2', + 'condition': 'checkout_mac and checkout_src_internal', }, - 'src/third_party/screen-ai/windows_386': { - 'packages': [ - { - 'package': 'chromium/third_party/screen-ai/windows-386', - 'version': Var('screen_ai_windows_386'), - }, - ], - 'condition': 'checkout_win', - 'dep_type': 'cipd', + # OpenGL ES 3.X Conformance tests. + "src/third_party/khronos_glcts": { + 'url': Var('chrome_git') + '/chrome/deps/khronos_glcts.git' + '@' + + 'eedb0baca9e88c53596874901ff5f6136102d20d', + 'condition': 'checkout_src_internal', }, 'src/third_party/soda': { @@ -4722,7 +4346,7 @@ deps = { 'version': 'StdK8khsivYZXVo2wZuVMnDN_xrVO2a8HV8kvfJ3emwC', }, ], - 'condition': 'checkout_linux and checkout_soda and checkout_src_internal and non_git_source', + 'condition': 'checkout_linux and checkout_soda and checkout_src_internal', 'dep_type': 'cipd', }, @@ -4767,23 +4391,23 @@ deps = { 'src/third_party/widevine/cdm/linux': { 'url': Var('chrome_git') + '/chrome/deps/widevine/cdm/linux.git' + '@' + - '8a12afc6ad470fac67ecb97bc9acf4bdbf9285e7', + 'a491291d608cdb117f2d1e449e8c9b44a0173548', 'condition': 'checkout_linux and checkout_src_internal', }, 'src/third_party/widevine/cdm/mac': { 'url': Var('chrome_git') + '/chrome/deps/widevine/cdm/mac.git' + '@' + - '8c2898cf5e27669beeb7fc432a30f953f2541106', + '2796e8b7ae5cb53ffa9711fdca1cd4247a1f3968', 'condition': 'checkout_mac and checkout_src_internal', }, 'src/third_party/widevine/cdm/win': { 'url': Var('chrome_git') + '/chrome/deps/widevine/cdm/win.git' + '@' + - '33d580b25178a85837950972b985f555c6d65fa9', + '4f0b47c1af51699e62344d055b1a6d61f87aec13', 'condition': 'checkout_win and checkout_src_internal', }, - 'src/third_party/widevine/scripts': { + "src/third_party/widevine/scripts": { 'url': Var('chrome_git') + '/chrome/deps/widevine/scripts.git' + '@' + '6ae793a606aeed0d0f1c6f688117653710137744', 'condition': 'checkout_src_internal', @@ -4850,13 +4474,6 @@ include_rules = [ '+third_party/perfetto/include/perfetto/tracing', '+third_party/perfetto/include/perfetto/test', - # PartitionAlloc is located at `base/allocator/partition_allocator` but - # prefers its own include path: - # `#include "partition_alloc/..."` is prefered to - # `#include "base/allocator/partition_allocator/src/partition_alloc/..."`. - "+partition_alloc", - "-base/allocator/partition_allocator", - # Everybody can use headers generated by tools/generate_library_loader. '+library_loaders', @@ -4870,8 +4487,6 @@ include_rules = [ # //styleguide/c++/c++-features.md. '+third_party/abseil-cpp', '-third_party/abseil-cpp/absl/algorithm/container.h', - '-third_party/abseil-cpp/absl/base/attributes.h', - '-third_party/abseil-cpp/absl/base/no_destructor.h', '-third_party/abseil-cpp/absl/base/nullability.h', '-third_party/abseil-cpp/absl/container', '+third_party/abseil-cpp/absl/container/inlined_vector.h', @@ -4880,7 +4495,6 @@ include_rules = [ '-third_party/abseil-cpp/absl/functional/any_invocable.h', '-third_party/abseil-cpp/absl/functional/bind_front.h', '-third_party/abseil-cpp/absl/functional/function_ref.h', - '-third_party/abseil-cpp/absl/functional/overload.h', '-third_party/abseil-cpp/absl/hash', '-third_party/abseil-cpp/absl/log', '-third_party/abseil-cpp/absl/random', @@ -4888,11 +4502,9 @@ include_rules = [ '-third_party/abseil-cpp/absl/strings', '+third_party/abseil-cpp/absl/strings/ascii.h', '+third_party/abseil-cpp/absl/strings/cord.h', - '+third_party/abseil-cpp/absl/strings/str_format.h', '-third_party/abseil-cpp/absl/synchronization', '-third_party/abseil-cpp/absl/time', '-third_party/abseil-cpp/absl/types/any.h', - '-third_party/abseil-cpp/absl/types/optional.h', '-third_party/abseil-cpp/absl/types/span.h', ] @@ -4997,6 +4609,54 @@ hooks = [ 'sync', '--extract', ], }, + { + 'name': 'sysroot_arm', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_arm', + 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--sysroots-json-path=' + Var('sysroots_json_path'), + '--arch=arm'], + }, + { + 'name': 'sysroot_arm64', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_arm64', + 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--sysroots-json-path=' + Var('sysroots_json_path'), + '--arch=arm64'], + }, + { + 'name': 'sysroot_x86', + 'pattern': '.', + 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)', + 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--sysroots-json-path=' + Var('sysroots_json_path'), + '--arch=x86'], + }, + { + 'name': 'sysroot_mips', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_mips', + 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--sysroots-json-path=' + Var('sysroots_json_path'), + '--arch=mips'], + }, + { + 'name': 'sysroot_mips64', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_mips64', + 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--sysroots-json-path=' + Var('sysroots_json_path'), + '--arch=mips64el'], + }, + { + 'name': 'sysroot_x64', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_x64', + 'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--sysroots-json-path=' + Var('sysroots_json_path'), + '--arch=x64'], + }, { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', @@ -5024,17 +4684,68 @@ hooks = [ 'condition': 'checkout_mac or checkout_ios', 'action': ['python3', 'src/build/mac_toolchain.py'], }, + { + # Update the prebuilt clang toolchain. + # Note: On Win, this should run after win_toolchain, as it may use it. + 'name': 'clang', + 'pattern': '.', + 'condition': 'not llvm_force_head_revision', + 'action': ['python3', 'src/tools/clang/scripts/update.py'], + }, + { + # Update prebuilt Rust toolchain. + 'name': 'rust-toolchain', + 'pattern': '.', + 'condition': 'checkout_rust', + 'action': ['python3', 'src/tools/rust/update_rust.py'], + }, { # Build the clang toolchain from tip-of-tree. # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang_tot', 'pattern': '.', 'condition': 'llvm_force_head_revision', - 'action': ['vpython3', 'src/tools/clang/scripts/build.py', + 'action': ['python3', 'src/tools/clang/scripts/build.py', '--llvm-force-head-revision', '--with-android={checkout_android}', '--with-fuchsia={checkout_fuchsia}'], }, + { + # This is supposed to support the same set of platforms as 'clang' above. + 'name': 'clang_coverage', + 'pattern': '.', + 'condition': 'checkout_clang_coverage_tools', + 'action': ['python3', 'src/tools/clang/scripts/update.py', + '--package=coverage_tools'], + }, + { + # This is also supposed to support the same set of platforms as 'clang' + # above. LLVM ToT support isn't provided at the moment. + 'name': 'clang_tidy', + 'pattern': '.', + 'condition': 'checkout_clang_tidy', + 'action': ['python3', 'src/tools/clang/scripts/update.py', + '--package=clang-tidy'], + }, + { + # This is also supposed to support the same set of platforms as 'clang' + # above. LLVM ToT support isn't provided at the moment. + 'name': 'clangd', + 'pattern': '.', + 'condition': 'checkout_clangd', + 'action': ['python3', 'src/tools/clang/scripts/update.py', + '--package=clangd'], + }, + { + # Should run after the clang hook. Used on mac, as well as for orderfile + # generation and size tooling on Android. Used by + # dump-static-initializers.py on linux. + 'name': 'objdump', + 'pattern': '.', + 'condition': 'checkout_linux or checkout_mac or checkout_android and host_os != "mac"', + 'action': ['python3', 'src/tools/clang/scripts/update.py', + '--package=objdump'], + }, { # Update LASTCHANGE. 'name': 'lastchange', @@ -5068,84 +4779,292 @@ hooks = [ '-s', 'src/third_party/dawn', '--revision', 'src/gpu/webgpu/DAWN_VERSION'], }, - # Pull dsymutil binaries using checked-in hashes. + # Pull dsymutil binaries using checked-in hashes. + { + 'name': 'dsymutil_mac_arm64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang', + '-s', 'src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1', + '-o', 'src/tools/clang/dsymutil/bin/dsymutil', + ], + }, + { + 'name': 'dsymutil_mac_x64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "x64"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang', + '-s', 'src/tools/clang/dsymutil/bin/dsymutil.x64.sha1', + '-o', 'src/tools/clang/dsymutil/bin/dsymutil', + ], + }, + + # Pull clang-format binaries using checked-in hashes. + { + 'name': 'clang_format_win', + 'pattern': '.', + 'condition': 'host_os == "win"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-clang-format', + '-s', 'src/buildtools/win/clang-format.exe.sha1', + ], + }, + { + 'name': 'clang_format_mac_x64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "x64"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-clang-format', + '-s', 'src/buildtools/mac/clang-format.x64.sha1', + '-o', 'src/buildtools/mac/clang-format', + ], + }, + { + 'name': 'clang_format_mac_arm64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-clang-format', + '-s', 'src/buildtools/mac/clang-format.arm64.sha1', + '-o', 'src/buildtools/mac/clang-format', + ], + }, + { + 'name': 'clang_format_linux', + 'pattern': '.', + 'condition': 'host_os == "linux"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-clang-format', + '-s', 'src/buildtools/linux64/clang-format.sha1', + ], + }, + # Pull rc binaries using checked-in hashes. + { + 'name': 'rc_win', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "win"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/win/rc.exe.sha1', + ], + }, + { + 'name': 'rc_mac', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "mac"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', + ], + }, + { + 'name': 'rc_linux', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "linux"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1', + ] + }, + { + 'name': 'test_fonts', + 'pattern': '.', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--extract', + '--no_auth', + '--bucket', 'chromium-fonts', + '-s', 'src/third_party/test_fonts/test_fonts.tar.gz.sha1', + ], + }, + # Download test resources for opus, i.e. audio files. + { + 'name': 'opus_test_files', + 'pattern': '.', + 'action': ['python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_auth', + '--quiet', + '--bucket', 'chromium-webrtc-resources', + '-d', 'src/third_party/opus/tests/resources'], + }, + { + 'name': 'apache_win32', + 'pattern': '\\.sha1', + 'condition': 'checkout_win', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--directory', + '--recursive', + '--no_auth', + '--num_threads=16', + '--bucket', 'chromium-apache-win32', + 'src/third_party/apache-win32', + ], + }, + { + 'name': 'msan_chained_origins_focal', + 'pattern': '.', + 'condition': 'checkout_instrumented_libraries', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-instrumented-libraries', + '-s', 'src/third_party/instrumented_libraries/binaries/msan-chained-origins-focal.tgz.sha1', + ], + }, + { + 'name': 'msan_no_origins_focal', + 'pattern': '.', + 'condition': 'checkout_instrumented_libraries', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-instrumented-libraries', + '-s', 'src/third_party/instrumented_libraries/binaries/msan-no-origins-focal.tgz.sha1', + ], + }, + { + 'name': 'wasm_fuzzer', + 'pattern': '.', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '-u', + '--bucket', 'v8-wasm-fuzzer', + '-s', 'src/v8/test/fuzzer/wasm_corpus.tar.gz.sha1', + ], + }, + # Download selected models from TFHub as testdata. + { + 'name': 'download_tfhub_models', + 'pattern': '.', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--extract', + '--bucket', 'chromium-tfhub-models', + '-s', 'src/third_party/tfhub_models/models.tar.gz.sha1', + ], + }, + + # Pull down Node binaries for WebUI toolchain. { - 'name': 'dsymutil_mac_arm64', + 'name': 'node_linux64', 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "arm64"', + 'condition': 'host_os == "linux"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', + '--extract', '--no_auth', - '--bucket', 'chromium-browser-clang', - '-s', 'src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1', - '-o', 'src/tools/clang/dsymutil/bin/dsymutil', + '--bucket', 'chromium-nodejs/16.13.0', + '-s', 'src/third_party/node/linux/node-linux-x64.tar.gz.sha1', ], }, + # The Mac x64/arm64 binaries are downloaded regardless of host architecture + # since it's possible to cross-compile for the other architecture. This can + # cause problems for tests that use node if the test device architecture does + # not match the architecture of the compile machine. { - 'name': 'dsymutil_mac_x64', + 'name': 'node_mac', 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "x64"', + 'condition': 'host_os == "mac"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', + '--extract', '--no_auth', - '--bucket', 'chromium-browser-clang', - '-s', 'src/tools/clang/dsymutil/bin/dsymutil.x64.sha1', - '-o', 'src/tools/clang/dsymutil/bin/dsymutil', + '--bucket', 'chromium-nodejs/16.13.0', + '-s', 'src/third_party/node/mac/node-darwin-x64.tar.gz.sha1', ], }, - - # Pull rc binaries using checked-in hashes. { - 'name': 'rc_win', + 'name': 'node_mac_arm64', 'pattern': '.', - 'condition': 'checkout_win and host_os == "win"', + 'condition': 'host_os == "mac"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', + '--extract', '--no_auth', - '--bucket', 'chromium-browser-clang/rc', - '-s', 'src/build/toolchain/win/rc/win/rc.exe.sha1', + '--bucket', 'chromium-nodejs/16.13.0', + '-s', 'src/third_party/node/mac/node-darwin-arm64.tar.gz.sha1', ], }, { - 'name': 'rc_mac', + 'name': 'node_win', 'pattern': '.', - 'condition': 'checkout_win and host_os == "mac"', + 'condition': 'host_os == "win"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', '--no_auth', - '--bucket', 'chromium-browser-clang/rc', - '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', + '--bucket', 'chromium-nodejs/16.13.0', + '-s', 'src/third_party/node/win/node.exe.sha1', ], }, + + # Pull down NPM dependencies for WebUI toolchain. { - 'name': 'rc_linux', + 'name': 'webui_node_modules', 'pattern': '.', - 'condition': 'checkout_win and host_os == "linux"', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', + '--extract', '--no_auth', - '--bucket', 'chromium-browser-clang/rc', - '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1', - ] + '--bucket', 'chromium-nodejs', + '-s', 'src/third_party/node/node_modules.tar.gz.sha1', + ], }, + + # NPM dependencies for JavaScript code coverage. { - 'name': 'apache_win32', - 'pattern': '\\.sha1', - 'condition': 'checkout_win', + 'name': 'js_coverage_node_modules', + 'condition': 'checkout_js_coverage_modules', + 'pattern': '.', 'action': [ 'python3', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', - '--directory', - '--recursive', + '--extract', '--no_auth', - '--num_threads=16', - '--bucket', 'chromium-apache-win32', - 'src/third_party/apache-win32', + '--bucket', 'chromium-nodejs/js_code_coverage', + '-s', 'src/third_party/js_code_coverage/node_modules.tar.gz.sha1', ], }, @@ -5205,11 +5124,51 @@ hooks = [ ], }, + # Download test data for Perfetto diff tests + { + 'name': 'perfetto_testdata', + 'condition': 'host_os == "linux"', + 'pattern': '\\.sha256', + 'action': [ 'python3', + 'src/third_party/perfetto/tools/test_data', + '--dir', + 'src/base/tracing/test/data', + 'download', + ], + }, + + # Download test data for Maps telemetry_gpu_integration_test. + { + 'name': 'maps_perf_test_load_dataset', + 'pattern': '\\.sha1', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-telemetry', + '-s', 'src/tools/perf/page_sets/maps_perf_test/load_dataset.sha1', + ], + }, + + # Pull down Zucchini test data. + { + 'name': 'zucchini_testdata', + 'pattern': '.', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--num_threads=4', + '--bucket', 'chromium-binary-patching/zucchini_testdata', + '--recursive', + '-d', 'src/components/zucchini', + ], + }, # Pull down WPR Archive files { 'name': 'Fetch WPR archive files', 'pattern': '.', - 'condition': 'checkout_android and checkout_wpr_archives', + 'condition': 'checkout_android and (checkout_wpr_archives or checkout_src_internal)', 'action': [ 'python3', 'src/chrome/test/data/android/manage_wpr_archives.py', 'download', @@ -5227,7 +5186,7 @@ hooks = [ { 'name': 'Fetch Android AFDO profile', 'pattern': '.', - 'condition': 'checkout_android and checkout_pgo_profiles', + 'condition': 'checkout_android', 'action': [ 'python3', 'src/tools/download_optimization_profile.py', '--newest_state=src/chrome/android/profiles/newest.txt', @@ -5239,7 +5198,7 @@ hooks = [ { 'name': 'Fetch Android Arm AFDO profile', 'pattern': '.', - 'condition': 'checkout_android and checkout_pgo_profiles', + 'condition': 'checkout_android', 'action': [ 'python3', 'src/tools/download_optimization_profile.py', '--newest_state=src/chrome/android/profiles/arm.newest.txt', @@ -5248,6 +5207,59 @@ hooks = [ '--gs_url_base=chromeos-prebuilt/afdo-job/llvm', ], }, + { + 'name': 'gvr_static_shim_android', + 'pattern': '\\.sha1', + 'condition': 'checkout_android', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-gvr-static-shim', + '-d', 'src/third_party/gvr-android-sdk', + ], + }, + { + 'name': 'vr_controller_test_api', + 'pattern': '\\.sha1', + 'condition': 'checkout_android', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-gvr-static-shim/controller_test_api', + '-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1', + ], + }, + { + 'name': 'vr_assets', + 'pattern': '.', + 'condition': 'checkout_android and checkout_src_internal', + 'action': ['python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--bucket', 'chrome-vr-assets', + '--recursive', + '--directory', + 'src/chrome/browser/resources/vr/assets/google_chrome', + ], + }, + # Download and unpack MediaPipe Integration tests. + { + 'name': 'mediapipe_integration_testdata', + 'pattern': '.', + 'action': [ 'python3', + 'src/content/test/gpu/gpu_tests/mediapipe_update.py', + ], + }, + # Download VR test APKs only if the environment variable is set + { + 'name': 'vr_test_apks', + 'pattern': '.', + 'condition': 'checkout_android', + 'action': [ 'python3', + 'src/third_party/gvr-android-sdk/test-apks/update.py', + ], + }, # DOWNLOAD AR test APKs only if the environment variable is set { 'name': 'ar_test_apks', @@ -5257,6 +5269,17 @@ hooks = [ 'src/third_party/arcore-android-sdk/test-apks/update.py', ], }, + { + 'name': 'subresource-filter-ruleset', + 'pattern': '.', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-ads-detection', + '-s', 'src/third_party/subresource-filter-ruleset/data/UnindexedRules.sha1', + ], + }, # Download AFDO profiles for ChromeOS for each architecture. { 'name': 'Fetch ChromeOS AFDO profiles (from Intel Atom cores)', @@ -5295,9 +5318,31 @@ hooks = [ ], }, { - 'name': 'Download Fuchsia SDK', + 'name': 'Fetch ChromeOS AFDO profiles (experimental Arm profile)', + 'pattern': '.', + 'condition': 'checkout_chromeos or checkout_simplechrome', + 'action': [ 'python3', + 'src/tools/download_optimization_profile.py', + '--newest_state=src/chromeos/profiles/arm-exp.afdo.newest.txt', + '--local_state=src/chromeos/profiles/arm-exp.afdo.local.txt', + '--output_name=src/chromeos/profiles/arm-exp.afdo.prof', + '--gs_url_base=chromeos-prebuilt/afdo-job/vetted/release', + ], + }, + { + # Pull doclava binaries if building for Android. + 'name': 'doclava', + 'pattern': '.', + 'condition': 'checkout_android', + 'action': [ 'python3', + 'src/build/android/download_doclava.py', + ], + }, + + { + 'name': 'Download Fuchsia SDK from GCS', 'pattern': '.', - 'condition': 'checkout_fuchsia and not checkout_fuchsia_no_hooks', + 'condition': 'checkout_fuchsia', 'action': [ 'python3', 'src/build/fuchsia/update_sdk.py', @@ -5322,18 +5367,11 @@ hooks = [ 'pattern': '.', 'condition': 'checkout_fuchsia_internal and checkout_src_internal', 'action': ['python3', - 'src/build/fuchsia/update_product_bundles.py', - '{checkout_fuchsia_internal_images}', - '--internal'], - }, - - { - 'name': 'Create Fuchsia GN sdk build rules when not running update_sdk.py', - 'pattern': '.', - 'condition': 'checkout_fuchsia_no_hooks', - 'action': [ - 'python3', - 'src/build/fuchsia/gen_build_defs.py', + 'src/build/fuchsia/update_images.py', + '--default-bucket', 'fuchsia-sdk', + '--image-root-dir', + 'src/third_party/fuchsia-sdk/images-internal', + '--boot-images', '{checkout_fuchsia_internal_images}' ], }, @@ -5346,7 +5384,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--no-use-remoteexec', + '--nogoma', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5365,7 +5403,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--no-use-remoteexec', + '--nogoma', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5383,7 +5421,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--no-use-remoteexec', + '--nogoma', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5400,7 +5438,7 @@ hooks = [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', '--fallback-versions=20', - '--no-use-remoteexec', + '--nogoma', '--nogn-gen', '--no-shell', '--log-level=warning', @@ -5409,6 +5447,86 @@ hooks = [ '--download-vm', ], }, + # Download Lacros's version of the simplechrome sdks. VMs are disregarded + # because this version of sdk is only used for compiling Lacros. + { + 'name': 'cros_simplechrome_artifacts_with_vm for lacros', + 'pattern': '.', + 'condition': 'checkout_simplechrome_with_vms and not checkout_src_internal and checkout_lacros_sdk', + 'action': [ + 'vpython3', + 'src/third_party/chromite/bin/cros', + 'chrome-sdk', + '--fallback-versions=20', + '--nogoma', + '--nogn-gen', + '--no-shell', + '--log-level=warning', + '--cache-dir=src/build/cros_cache/', + '--use-external-config', + '--boards={cros_boards_with_qemu_images}', + '--is-lacros', + '--version={lacros_sdk_version}', + ], + }, + { + 'name': 'cros_simplechrome_artifacts_with_no_vm for lacros', + 'pattern': '.', + 'condition': 'checkout_simplechrome and not checkout_src_internal and checkout_lacros_sdk', + 'action': [ + 'vpython3', + 'src/third_party/chromite/bin/cros', + 'chrome-sdk', + '--fallback-versions=20', + '--nogoma', + '--nogn-gen', + '--no-shell', + '--log-level=warning', + '--cache-dir=src/build/cros_cache/', + '--use-external-config', + '--boards={cros_boards}', + '--is-lacros', + '--version={lacros_sdk_version}', + ], + }, + { + 'name': 'cros_simplechrome_artifacts_with_vm_internal for lacros', + 'pattern': '.', + 'condition': 'checkout_simplechrome_with_vms and checkout_src_internal and checkout_lacros_sdk', + 'action': [ + 'vpython3', + 'src/third_party/chromite/bin/cros', + 'chrome-sdk', + '--fallback-versions=20', + '--nogoma', + '--nogn-gen', + '--no-shell', + '--log-level=warning', + '--cache-dir=src/build/cros_cache/', + '--boards={cros_boards_with_qemu_images}', + '--is-lacros', + '--version={lacros_sdk_version}', + ], + }, + { + 'name': 'cros_simplechrome_artifacts_with_no_vm_internal for lacros', + 'pattern': '.', + 'condition': 'checkout_simplechrome and checkout_src_internal and checkout_lacros_sdk', + 'action': [ + 'vpython3', + 'src/third_party/chromite/bin/cros', + 'chrome-sdk', + '--fallback-versions=20', + '--nogoma', + '--nogn-gen', + '--no-shell', + '--log-level=warning', + '--cache-dir=src/build/cros_cache/', + '--boards={cros_boards}', + '--is-lacros', + '--version={lacros_sdk_version}', + ], + }, # Download PGO profiles. { @@ -5477,6 +5595,39 @@ hooks = [ '--gs-url-base=chromium-optimization-profiles/pgo_profiles', ], }, + { + 'name': 'Fetch PGO profiles for lacros amd64', + 'pattern': '.', + 'condition': 'checkout_pgo_profiles and checkout_lacros_sdk', + 'action': [ 'python3', + 'src/tools/update_pgo_profiles.py', + '--target=lacros64', + 'update', + '--gs-url-base=chromium-optimization-profiles/pgo_profiles', + ], + }, + { + 'name': 'Fetch PGO profiles for lacros arm', + 'pattern': '.', + 'condition': 'checkout_pgo_profiles and checkout_lacros_sdk', + 'action': [ 'python3', + 'src/tools/update_pgo_profiles.py', + '--target=lacros-arm', + 'update', + '--gs-url-base=chromium-optimization-profiles/pgo_profiles', + ], + }, + { + 'name': 'Fetch PGO profiles for lacros arm64', + 'pattern': '.', + 'condition': 'checkout_pgo_profiles and checkout_lacros_sdk', + 'action': [ 'python3', + 'src/tools/update_pgo_profiles.py', + '--target=lacros-arm64', + 'update', + '--gs-url-base=chromium-optimization-profiles/pgo_profiles', + ], + }, { 'name': 'Fetch PGO profiles for android arm32', 'pattern': '.', @@ -5504,14 +5655,12 @@ hooks = [ 'pattern': '.', # Always download profiles on Android builds. The GN arg `is_official_build` # is required to consider the profiles during build time. - 'condition': 'checkout_pgo_profiles', + 'condition': 'checkout_pgo_profiles or checkout_android', 'action': [ 'python3', 'src/v8/tools/builtins-pgo/download_profiles.py', 'download', '--depot-tools', 'src/third_party/depot_tools', - '--check-v8-revision', - '--quiet', ], }, @@ -5538,42 +5687,32 @@ hooks = [ 'condition': 'generate_location_tags', }, - # Configure remote exec cfg files { - # Use luci_auth if on windows and using chrome-untrusted project - 'name': 'download_and_configure_reclient_cfgs', + # Clean up build dirs for crbug.com/1337238. + # After a libc++ roll and revert, .ninja_deps would get into a state + # that breaks Ninja on Windows. + # TODO(crbug.com/1409337): Remove this after updating Ninja 1.12 or newer. + 'name': 'del_ninja_deps_cache', 'pattern': '.', - 'condition': 'download_remoteexec_cfg and host_os == "win"', - 'action': ['python3', - 'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py', - '--rbe_instance', - Var('rbe_instance'), - '--reproxy_cfg_template', - 'reproxy.cfg.template', - '--rewrapper_cfg_project', - Var('rewrapper_cfg_project'), - '--use_luci_auth_credshelper', - '--quiet', - ], - }, { - 'name': 'download_and_configure_reclient_cfgs', + 'condition': 'host_os == "win"', + 'action': ['python3', 'src/build/del_ninja_deps_cache.py'], + }, + # Download test resources for the style perftest. + { + 'name': 'style_perftest_files', 'pattern': '.', - 'condition': 'download_remoteexec_cfg and not host_os == "win"', 'action': ['python3', - 'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py', - '--rbe_instance', - Var('rbe_instance'), - '--reproxy_cfg_template', - 'reproxy.cfg.template', - '--rewrapper_cfg_project', - Var('rewrapper_cfg_project'), + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_auth', '--quiet', - ], + '--bucket', 'chromium-style-perftest', + '-d', 'src/third_party/blink/renderer/core/css/perftest_data'], }, + # Configure remote exec cfg files { 'name': 'configure_reclient_cfgs', 'pattern': '.', - 'condition': 'not download_remoteexec_cfg', + 'condition': 'download_remoteexec_cfg', 'action': ['python3', 'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py', '--rbe_instance', @@ -5607,18 +5746,6 @@ hooks = [ 'gs://aom-test-data', 'src/third_party/libaom/testdata'] }, - { - 'name': 'libvpx_testdata', - 'pattern': '.', - 'condition': 'download_libvpx_testdata', - 'action': ['python3', - 'src/third_party/depot_tools/gsutil.py', - '-q', - '-m', - 'rsync', - 'gs://downloads.webmproject.org/test_data/libvpx', - 'src/third_party/libvpx/testdata'], - }, ] # Add any corresponding DEPS files from this list to chromium.exclusions in @@ -5630,12 +5757,14 @@ recursedeps = [ # Dawn manages DEPS for its copy of the WebGPU CTS as well as GLFW for which # it has build files. 'src/third_party/dawn', - 'src/third_party/instrumented_libs', + 'src/third_party/devtools-frontend-internal', 'src/third_party/openscreen/src', - 'src/third_party/devtools-frontend/src', + 'src/third_party/vulkan-deps', # clank has its own DEPS file, does not need to be in trybot_analyze_config # since the roller does not run tests. 'src/clank', + 'src/chromeos/assistant/internal', + 'src/chrome/chrome_cleaner/internal', 'src/components/optimization_guide/internal', 'src/ios_internal', ] From c593c487cd440d4c9e6349bc84b1898b0d6bca30 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 16 Apr 2025 16:32:29 +0100 Subject: [PATCH 38/68] increase timeout due to how long build steps take --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index eb13942a19b4e6..36bbeff340b83a 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,5 +1,5 @@ # Set build timeout to 120 mins rather than the default of 10 mins -timeout: 7200s +timeout: 43200s options: machineType: 'E2_HIGHCPU_32' From d09e9bed81c905d0e9b032a2467fdcb881886bc2 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 16 Apr 2025 17:58:44 +0100 Subject: [PATCH 39/68] use full path when running autoninja --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 36bbeff340b83a..42bcd7143a9a3d 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -145,7 +145,7 @@ steps: - | set -e cd /workspace/hopium/src - autoninja -C out/Debug chrome -j 32 + /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' @@ -163,4 +163,4 @@ steps: - name: 'gcr.io/cloud-builders/gsutil' id: 'upload-artifact' waitFor: [ 'verify-binary' ] - args: ['cp', '-r', '/workspace/hopium/src/out/Debug/TotalBrowser', 'gs://tmp_tbr_build_output_bucket/$TAG_NAME'] + args: ['cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp_tbr_build_output_bucket/$TAG_NAME'] From 23921d0269a3e24d26c94ab66002ad1fa40f8b29 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 17 Apr 2025 10:26:46 +0100 Subject: [PATCH 40/68] added missing enum for SEARCH_ENGINE_HOPIUM --- components/search_engines/search_engine_type.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h index ab078967ce6772..cc34987cc99222 100644 --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h @@ -79,6 +79,8 @@ enum SearchEngineType { SEARCH_ENGINE_STARTER_PACK_HISTORY = 62, SEARCH_ENGINE_STARTER_PACK_TABS = 63, + SEARCH_ENGINE_HOPIUM, + SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. }; From 5fad438758bf5a81c81ac5ffcd500274e790e998 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 17 Apr 2025 13:26:05 +0100 Subject: [PATCH 41/68] updated builder image --- cloudbuild.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 42bcd7143a9a3d..cf6fba6e79aaba 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -22,7 +22,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'prepare' waitFor: [ 'sshkey' ] entrypoint: 'bash' @@ -49,7 +49,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 3. Fetch the Code - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -64,7 +64,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -78,7 +78,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -94,7 +94,7 @@ steps: path: "/root/.ssh" # 4. Configure & Build - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -125,7 +125,7 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -136,7 +136,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -148,7 +148,7 @@ steps: /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.3' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From 82184a56aa174bf5b27ba9b5e7e08ec8c1733618 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 17 Apr 2025 16:29:34 +0100 Subject: [PATCH 42/68] updated runner versions --- cloudbuild.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index cf6fba6e79aaba..9359a0de980881 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -22,7 +22,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'prepare' waitFor: [ 'sshkey' ] entrypoint: 'bash' @@ -49,7 +49,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 3. Fetch the Code - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -64,7 +64,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -78,7 +78,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -94,7 +94,7 @@ steps: path: "/root/.ssh" # 4. Configure & Build - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -125,7 +125,7 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -136,7 +136,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -148,7 +148,7 @@ steps: /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.4' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From 47a15cce9fabcbfcdd1af3f996f45d837b71f1ba Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Mon, 21 Apr 2025 16:50:11 +0100 Subject: [PATCH 43/68] increase builder disk size --- cloudbuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 9359a0de980881..abbcd6f235e6fb 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -3,6 +3,7 @@ timeout: 43200s options: machineType: 'E2_HIGHCPU_32' + diskSizeGb: 200 logging: 'CLOUD_LOGGING_ONLY' steps: From b5101949e02ac78613bb475cc3fa1446508514f4 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Mon, 21 Apr 2025 20:57:44 +0100 Subject: [PATCH 44/68] updated runner versions --- cloudbuild.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index abbcd6f235e6fb..78b4b686834948 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,7 +23,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'prepare' waitFor: [ 'sshkey' ] entrypoint: 'bash' @@ -50,7 +50,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 3. Fetch the Code - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -65,7 +65,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -79,7 +79,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -95,7 +95,7 @@ steps: path: "/root/.ssh" # 4. Configure & Build - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -126,7 +126,7 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -137,7 +137,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -149,7 +149,7 @@ steps: /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.5' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From 1260ca9e80b0a4765bb2211104ea02f7615eb5ac Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Tue, 22 Apr 2025 01:20:42 +0100 Subject: [PATCH 45/68] used fixed cloudbuild runner --- cloudbuild.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 78b4b686834948..ce3416e10a7a65 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,7 +23,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'prepare' waitFor: [ 'sshkey' ] entrypoint: 'bash' @@ -50,7 +50,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 3. Fetch the Code - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -65,7 +65,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -79,7 +79,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -95,7 +95,7 @@ steps: path: "/root/.ssh" # 4. Configure & Build - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -126,7 +126,7 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -137,7 +137,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -149,7 +149,7 @@ steps: /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.6' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From 431679660ea448eb15b93db0292436d3c7d40abb Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Tue, 22 Apr 2025 16:45:00 +0100 Subject: [PATCH 46/68] bumped cloud build runner versions --- cloudbuild.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index ce3416e10a7a65..38d4a1427eddfa 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,7 +23,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'prepare' waitFor: [ 'sshkey' ] entrypoint: 'bash' @@ -50,7 +50,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 3. Fetch the Code - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -65,7 +65,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -79,7 +79,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -95,7 +95,7 @@ steps: path: "/root/.ssh" # 4. Configure & Build - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -126,7 +126,7 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -137,7 +137,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -149,7 +149,7 @@ steps: /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.7' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From 7fe37da9e0849d4aef32d489eca83ddcbac7b2b1 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Tue, 22 Apr 2025 17:17:13 +0100 Subject: [PATCH 47/68] bumped cloudbuild runner versions --- cloudbuild.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 38d4a1427eddfa..0372c6cc5dec5d 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,7 +23,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'prepare' waitFor: [ 'sshkey' ] entrypoint: 'bash' @@ -50,7 +50,7 @@ steps: args: ['clone', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git', '/workspace/depot_tools'] # 3. Fetch the Code - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'configure-gclient' waitFor: [ 'clone-depot-tools' ] entrypoint: 'bash' @@ -65,7 +65,7 @@ steps: --custom-var checkout_pgo_profiles=True \ git@github.com:protectednet/hopium.git - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'sync-deps' waitFor: [ 'configure-gclient' ] entrypoint: 'bash' @@ -79,7 +79,7 @@ steps: - name: ssh path: "/root/.ssh" - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'checkout-branch' waitFor: [ 'sync-deps' ] entrypoint: 'bash' @@ -95,7 +95,7 @@ steps: path: "/root/.ssh" # 4. Configure & Build - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'configure-build' waitFor: [ 'checkout-branch' ] entrypoint: 'bash' @@ -126,7 +126,7 @@ steps: enable_media_foundation=true EOF - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'branding-script' waitFor: [ 'configure-build' ] entrypoint: 'bash' @@ -137,7 +137,7 @@ steps: cd /workspace/hopium/src python3 hopium/tsec_branding/pre_rebrand.py -b totalbrowser - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'build-browser' waitFor: [ 'branding-script' ] entrypoint: 'bash' @@ -149,7 +149,7 @@ steps: /workspace/depot_tools/autoninja -C out/Debug chrome -j 32 # 5. Post-Build Verification - - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.8' + - name: 'gcr.io/protected-app-builds/totalbrowser-builder:1.0.9' id: 'verify-binary' waitFor: [ 'build-browser' ] entrypoint: 'bash' From 7ba412039f550ac7a2627ab7c41902935f20927f Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 23 Apr 2025 11:14:41 +0100 Subject: [PATCH 48/68] use private pool for cloudbuild --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 0372c6cc5dec5d..cb42833753ab12 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,8 +2,8 @@ timeout: 43200s options: - machineType: 'E2_HIGHCPU_32' - diskSizeGb: 200 + pool: + name: 'projects/protected-app-builds/locations/us-east4/workerPools/e2-standard-32-private-pool' logging: 'CLOUD_LOGGING_ONLY' steps: From 722f4e5499776ebfb5baaef71bafc1afe0afdb1f Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 23 Apr 2025 11:19:08 +0100 Subject: [PATCH 49/68] reduce timeout --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index cb42833753ab12..dae1e1fc1fc0f8 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,5 +1,5 @@ -# Set build timeout to 120 mins rather than the default of 10 mins -timeout: 43200s +# Set build timeout to 4 hours rather than the default of 10 mins +timeout: 14400s options: pool: From 5a5eeaccc22e83f53dcbaa6dc74c50abb8ec6d88 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 23 Apr 2025 16:13:58 +0100 Subject: [PATCH 50/68] try rate limiting sync-deps step to avoid getting blocked --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index dae1e1fc1fc0f8..38ba41e11d8ec4 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -74,7 +74,7 @@ steps: - | set -e cd /workspace/hopium - /workspace/depot_tools/gclient sync -v -r $TAG_NAME + /workspace/depot_tools/gclient sync -j 8 -v -r $TAG_NAME volumes: - name: ssh path: "/root/.ssh" From dc58687016865354e612239db9be71c021d2507b Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 24 Apr 2025 14:59:20 +0100 Subject: [PATCH 51/68] fix bucket uri typo --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 38ba41e11d8ec4..2c8186fa54fd10 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -164,4 +164,4 @@ steps: - name: 'gcr.io/cloud-builders/gsutil' id: 'upload-artifact' waitFor: [ 'verify-binary' ] - args: ['cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp_tbr_build_output_bucket/$TAG_NAME'] + args: ['cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] From fc342b943899359bebf7944c4c33bd919cf18eca Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Thu, 24 Apr 2025 20:25:58 +0100 Subject: [PATCH 52/68] increased timeout and pass -m option to speed up gsutil upload --- cloudbuild.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 2c8186fa54fd10..5bb37f623d9839 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,5 +1,5 @@ -# Set build timeout to 4 hours rather than the default of 10 mins -timeout: 14400s +# Set build timeout to 5 hours rather than the default of 10 mins +timeout: 18000s options: pool: @@ -164,4 +164,4 @@ steps: - name: 'gcr.io/cloud-builders/gsutil' id: 'upload-artifact' waitFor: [ 'verify-binary' ] - args: ['cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] + args: ['cp', '-m', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] From a3e0695628fee01a54df2a31eda832e756ebb9d0 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Fri, 25 Apr 2025 15:40:44 +0100 Subject: [PATCH 53/68] fix gsutil -m placement --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 5bb37f623d9839..cad2f6af898974 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -164,4 +164,4 @@ steps: - name: 'gcr.io/cloud-builders/gsutil' id: 'upload-artifact' waitFor: [ 'verify-binary' ] - args: ['cp', '-m', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] + args: ['-m', 'cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] From d9f9b0e44a14c1e5fe913f5b58aca8a4cff47672 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 14:41:23 +0100 Subject: [PATCH 54/68] added github pr workflow to enforce reviews for internal changes --- .github/workflows/pr.yml | 199 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 00000000000000..e5f1ee7052c4f7 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,199 @@ +name: Code Reviews +on: + pull_request: + types: [opened, synchronize, reopened] +jobs: + conditional_review: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Define Upstream Repository and Branch + id: upstream_config + run: | + echo "::set-output name=upstream_repo_url::https://github.com/chromium/chromium.git" + echo "::set-output name=upstream_branch_name::main" + + - name: Check Commit Origin Against Upstream + id: commit_origin_check + # This step should ideally only run if the PR opener was identified as an employee. + # For example, add: if: steps.pr_opener_check.outputs.is_employee_opener == 'true' + run: | + UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" + UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" + PR_BASE_REF="origin/${{ github.event.pull_request.base.ref }}" + PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" + + echo "Upstream Repository URL: $UPSTREAM_REPO_URL" + echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" # Clarified purpose + echo "PR Base Ref: $PR_BASE_REF" + echo "PR Head SHA: $PR_HEAD_SHA" + + # Add upstream remote if it doesn't exist + if ! git remote | grep -q '^upstream$'; then + echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" + git remote add upstream "$UPSTREAM_REPO_URL" + else + echo "Remote 'upstream' already exists. Setting URL." + git remote set-url upstream "$UPSTREAM_REPO_URL" + fi + + echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." + # Fetch only the specific target branch from upstream + git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 # Adjust depth as needed + UPSTREAM_BRANCH_HEAD_REF="upstream/$UPSTREAM_BRANCH_NAME" # Reference to the fetched upstream branch head + echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" + + # Determine the merge base between the PR's base in your fork and the PR's head + # This defines the starting point for commits introduced by this PR in your fork. + MERGE_BASE=$(git merge-base "$PR_BASE_REF" "$PR_HEAD_SHA") + if [ -z "$MERGE_BASE" ]; then + echo "Error: Could not determine merge base between $PR_BASE_REF and $PR_HEAD_SHA." + echo "This could indicate unrelated histories or issues fetching. For safety, requiring review." + echo "::set-output name=require_review::true" + exit 0 # Exit successfully for the script, but review is required + fi + echo "Merge Base for PR commits (relative to fork's base): $MERGE_BASE" + + # Get the list of commit SHAs introduced by this PR in your fork + PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) + + if [ -z "$PR_COMMIT_SHAS" ]; then + echo "No new authored commits found in PR range." + echo "PR is an empty sync or just a merge from upstream chromium repo. No review required." + echo "::set-output name=require_review::false" + exit 0 + fi + echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" + echo "$PR_COMMIT_SHAS" + + ALL_COMMITS_ARE_UPSTREAM=true + for commit_sha in $PR_COMMIT_SHAS; do + echo "Verifying commit $commit_sha against $UPSTREAM_BRANCH_HEAD_REF..." + # Check if the commit_sha is an ancestor of the fetched upstream branch's head + if git merge-base --is-ancestor "$commit_sha" "$UPSTREAM_BRANCH_HEAD_REF"; then + echo "Commit $commit_sha FOUND in $UPSTREAM_BRANCH_HEAD_REF." + else + echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." + ALL_COMMITS_ARE_UPSTREAM=false + break # No need to check further, one local commit is enough + fi + done + + if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then + echo "All commits in this PR originate from the upstream branch ($UPSTREAM_BRANCH_NAME)." + echo "::set-output name=require_review::false" + else + echo "This PR contains commits not found on the upstream branch ($UPSTREAM_BRANCH_NAME). Internal review required." + echo "::set-output name=require_review::true" + fi + shell: bash + + - name: Determine Review Requirement and Add Labels + id: review_decision_and_labeling + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const requireReview = ${{ steps.commit_origin_check.outputs.require_review || 'false' }}; + const prNumber = context.issue.number; + const owner = context.repo.owner; + const repo = context.repo.repo; + let labelToAdd = ''; + let labelToRemove = ''; // Optional: if you want to remove the other label + + console.log(`PR is Purely Upstream: ${isPurelyUpstream}`); + + if (requireReview) { + console.log("Decision: PR contains purely upstream changes. Bypass review."); + labelToAdd = 'upstream-sync'; + labelToRemove = 'review-required'; + } else { + console.log("Decision: PR contains local/modified changes. Enforce review."); + labelToAdd = 'review-required'; + labelToRemove = 'upstream-sync'; + } + + core.setOutput('require_review', requireReview.toString()); + + // Add labels + if (labelToAdd) { + try { + await github.rest.issues.addLabels({ owner, repo, issue_number: prNumber, labels: [labelToAdd] }); + console.log(`Successfully added label: ${labelToAdd}`); + } catch (error) { + console.error(`Error adding label ${labelToAdd}: ${error.message}`); + exit 1 + } + } + + // Remove the other labels + if (labelToRemove) { + try { + const { data: existingLabels } = await github.rest.issues.listLabelsOnIssue({ owner, repo, issue_number: prNumber }); + const labelExists = existingLabels.some(label => label.name === labelToRemove); + + if (labelExists) { + await github.rest.issues.removeLabel({ owner, repo, issue_number: prNumber, name: labelToRemove }); + console.log(`Successfully removed label: ${labelToRemove}`); + } else { + console.log(`Label ${labelToRemove} not found on PR, no need to remove.`); + } + } catch (error) { + // Ignore errors if the label doesn't exist or other minor issues + console.warn(`Warning removing label ${labelToRemove}: ${error.message}`); + } + } + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Enforce Review + id: enforce_review + if: always() # Always run this step to make the final decision based on all factors + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const prNumber = context.issue.number; + const owner = context.repo.owner; + const repo = context.repo.repo; + const reviewCompletedLabel = 'review-completed'; + const upstreamSyncLabel = 'upstream-sync'; + + // Get the decision from the previous step + const requiresReview = ${{ steps.review_decision_and_labeling.outputs.require_review }}; + + const { data: labels } = await github.rest.issues.listLabelsOnIssue({ + owner, + repo, + issue_number: prNumber, + }); + + const hasReviewCompletedLabel = labels.some(label => label.name === reviewCompletedLabel); + const hasUpstreamSyncLabel = labels.some(label => label.name === upstreamSyncLabel); + + if (hasReviewCompletedLabel) { + console.log(`Review confirmed: PR has the '${reviewCompletedLabel}' label. Workflow check passed.`); + if (labels.some(label => label.name === 'review-required')) { + try { + await github.rest.issues.removeLabel({ owner, repo, issue_number: prNumber, name: 'review-required' }); + console.log("Cleaned up 'review-required' label after completion."); + } catch (error) { + console.warn("Could not remove 'review-required' label during cleanup: " + error.message); + } + } + return; + } + + if (hasUpstreamSyncLabel && requiresReview === 'false') { + console.log(`PR is an upstream sync and does not require further review by this action. Workflow check passed.`); + return; + } + + if (requiresReview === 'true') { + console.log(`Internal review is required (PR contains local/modified commits) AND '${reviewCompletedLabel}' label is NOT present. Failing check.`); + core.setFailed(`Review required: PR contains local/modified commits and lacks '${reviewCompletedLabel}' label.`); + } else { + console.log("PR does not require review based on origin and is not marked as completed. Passing by default for this path."); + } From 4a07c3017943535017ff0d16f3afa0578fff6d6f Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 14:43:03 +0100 Subject: [PATCH 55/68] added github pr workflow to enforce reviews for internal changes --- .github/workflows/pr.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e5f1ee7052c4f7..76d2575d4231ce 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -17,8 +17,6 @@ jobs: - name: Check Commit Origin Against Upstream id: commit_origin_check - # This step should ideally only run if the PR opener was identified as an employee. - # For example, add: if: steps.pr_opener_check.outputs.is_employee_opener == 'true' run: | UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" @@ -52,7 +50,7 @@ jobs: echo "Error: Could not determine merge base between $PR_BASE_REF and $PR_HEAD_SHA." echo "This could indicate unrelated histories or issues fetching. For safety, requiring review." echo "::set-output name=require_review::true" - exit 0 # Exit successfully for the script, but review is required + exit 0 fi echo "Merge Base for PR commits (relative to fork's base): $MERGE_BASE" @@ -101,7 +99,7 @@ jobs: const owner = context.repo.owner; const repo = context.repo.repo; let labelToAdd = ''; - let labelToRemove = ''; // Optional: if you want to remove the other label + let labelToRemove = ''; console.log(`PR is Purely Upstream: ${isPurelyUpstream}`); From 7063e6e2ca7ea74943b564eae266eb07e3e5d0a4 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 14:44:12 +0100 Subject: [PATCH 56/68] added github pr workflow to enforce reviews for internal changes --- .github/workflows/pr.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 76d2575d4231ce..a20afea293b9b8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,7 +1,13 @@ name: Code Reviews on: pull_request: - types: [opened, synchronize, reopened] + branches: + - main + types: + - opened + - reopened + - synchronize + - ready_for_review jobs: conditional_review: runs-on: ubuntu-latest From 507f15e0fc8db38f65de0a86e803bd3bf8aac884 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 14:54:18 +0100 Subject: [PATCH 57/68] debug whole output dir --- cloudbuild.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index cad2f6af898974..b7cdf08ea939bf 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -157,11 +157,12 @@ steps: - '-c' - | set -e + ls -lh /workspace/hopium/src/out/ ls -lh /workspace/hopium/src/out/Debug # 6. Store Build Artifacts - - name: 'gcr.io/cloud-builders/gsutil' - id: 'upload-artifact' - waitFor: [ 'verify-binary' ] - args: ['-m', 'cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] +# - name: 'gcr.io/cloud-builders/gsutil' +# id: 'upload-artifact' +# waitFor: [ 'verify-binary' ] +# args: ['-m', 'cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] From b0da5cb5fcc88efb763aa46a6fa8ab8b7cdb22a8 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 15:21:27 +0100 Subject: [PATCH 58/68] added some suggested troubleshooting checks and logging --- .github/workflows/pr.yml | 153 +++++++++++++++++++++++++++------------ 1 file changed, 105 insertions(+), 48 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a20afea293b9b8..7569118dc32070 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,75 +24,132 @@ jobs: - name: Check Commit Origin Against Upstream id: commit_origin_check run: | - UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" - UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" - PR_BASE_REF="origin/${{ github.event.pull_request.base.ref }}" - PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" - + # --- Initial Git State & Configuration --- + echo "Current directory: $(pwd)" + echo "GitHub Repository: ${{ github.repository }}" + echo "GitHub Workflow: ${{ github.workflow }}" + echo "GitHub Run ID: ${{ github.run_id }}" + echo "GitHub Event Name: ${{ github.event_name }}" + echo "PR Base Ref from event: ${{ github.event.pull_request.base.ref }}" + echo "PR Head Ref from event: ${{ github.event.pull_request.head.ref }}" + echo "PR Head SHA from event: ${{ github.event.pull_request.head.sha }}" + echo "-----------------------------------------" + echo "--- Initial Git Setup by Checkout Action ---" + echo "Current branch (HEAD): $(git rev-parse --abbrev-ref HEAD)" + echo "Current commit (HEAD): $(git rev-parse HEAD)" + echo "Remotes:" + git remote -v + echo "Local branches:" + git branch + echo "All refs (local and remote-tracking):" + git show-ref + echo "-----------------------------------------" + + UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" + UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" + # Define PR base branch name and the full ref for it + PR_BASE_BRANCH_NAME="${{ github.event.pull_request.base.ref }}" + PR_ACTUAL_BASE_REF="refs/remotes/origin/$PR_BASE_BRANCH_NAME" # This is the ref we need to ensure exists + PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" + echo "Upstream Repository URL: $UPSTREAM_REPO_URL" - echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" # Clarified purpose - echo "PR Base Ref: $PR_BASE_REF" + echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" + echo "PR Base Branch Name (in fork): $PR_BASE_BRANCH_NAME" + echo "PR Actual Base Ref to use: $PR_ACTUAL_BASE_REF" echo "PR Head SHA: $PR_HEAD_SHA" - - # Add upstream remote if it doesn't exist - if ! git remote | grep -q '^upstream$'; then + + # --- Details for 'origin' remote before fetching PR base --- + echo "Showing details for 'origin' remote:" + git remote show origin + echo "Checking if '$PR_ACTUAL_BASE_REF' exists before explicit fetch:" + git rev-parse --verify "$PR_ACTUAL_BASE_REF" || echo "Info: Ref '$PR_ACTUAL_BASE_REF' does NOT exist or is not valid yet." + echo "-------------------------------------------------------" + + # CRUCIAL STEP: Explicitly fetch the PR's base branch from origin to ensure its remote-tracking ref is available + echo "Fetching PR base branch '$PR_BASE_BRANCH_NAME' from origin (refspec: $PR_BASE_BRANCH_NAME:$PR_ACTUAL_BASE_REF)..." + git fetch origin "$PR_BASE_BRANCH_NAME:$PR_ACTUAL_BASE_REF" + echo "Fetch of PR base branch from origin complete." + + # --- Git State After Explicitly Fetching PR Base Branch from origin --- + echo "Remote-tracking branches (git branch -r) after origin fetch:" + git branch -r + echo "All refs (git show-ref) again after origin fetch:" + git show-ref + echo "Verifying ref '$PR_ACTUAL_BASE_REF' (SHA) after origin fetch:" + git rev-parse "$PR_ACTUAL_BASE_REF" || echo "Error: rev-parse failed for '$PR_ACTUAL_BASE_REF' even after explicit origin fetch!" + echo "Verifying ref type '$PR_ACTUAL_BASE_REF' (type) after origin fetch:" + git cat-file -t "$PR_ACTUAL_BASE_REF" || echo "Error: cat-file -t failed for '$PR_ACTUAL_BASE_REF' even after explicit origin fetch!" + echo "---------------------------------------------" + + # Add upstream remote if it doesn't exist + if ! git remote | grep -q '^upstream$'; then echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" git remote add upstream "$UPSTREAM_REPO_URL" - else + else echo "Remote 'upstream' already exists. Setting URL." git remote set-url upstream "$UPSTREAM_REPO_URL" - fi - + fi + echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." # Fetch only the specific target branch from upstream - git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 # Adjust depth as needed - UPSTREAM_BRANCH_HEAD_REF="upstream/$UPSTREAM_BRANCH_NAME" # Reference to the fetched upstream branch head - echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" - - # Determine the merge base between the PR's base in your fork and the PR's head - # This defines the starting point for commits introduced by this PR in your fork. - MERGE_BASE=$(git merge-base "$PR_BASE_REF" "$PR_HEAD_SHA") - if [ -z "$MERGE_BASE" ]; then - echo "Error: Could not determine merge base between $PR_BASE_REF and $PR_HEAD_SHA." + git fetch upstream "$UPSTREAM_BRANCH_NAME:refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" --no-tags --depth=5000 # Adjust depth as needed + UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" # Reference to the fetched upstream branch head + echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" + git rev-parse --verify "$UPSTREAM_BRANCH_HEAD_REF" || echo "Error: rev-parse failed for '$UPSTREAM_BRANCH_HEAD_REF' after upstream fetch!" + + + # --- Pre-Merge-Base Check --- + echo "Refs being passed to merge-base:" + echo " Ref 1 (PR Base): $PR_ACTUAL_BASE_REF" + echo " Ref 2 (PR Head): $PR_HEAD_SHA" + echo "Checking validity of Ref 1 ($PR_ACTUAL_BASE_REF):" + git rev-parse --verify "$PR_ACTUAL_BASE_REF" || echo "CRITICAL: '$PR_ACTUAL_BASE_REF' is not a valid object name just before merge-base!" + echo "Checking validity of Ref 2 ($PR_HEAD_SHA):" + git rev-parse --verify "$PR_HEAD_SHA" || echo "CRITICAL: '$PR_HEAD_SHA' is not a valid object name just before merge-base!" + echo "---------------------------" + + # Determine the merge base between the PR's base in your fork and the PR's head + MERGE_BASE=$(git merge-base "$PR_ACTUAL_BASE_REF" "$PR_HEAD_SHA") + if [ -z "$MERGE_BASE" ]; then + echo "Error: Could not determine merge base between '$PR_ACTUAL_BASE_REF' and '$PR_HEAD_SHA'." echo "This could indicate unrelated histories or issues fetching. For safety, requiring review." - echo "::set-output name=require_review::true" + core.setOutput('is_purely_upstream', 'false') # Corrected output name exit 0 - fi + fi echo "Merge Base for PR commits (relative to fork's base): $MERGE_BASE" - + # Get the list of commit SHAs introduced by this PR in your fork - PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) - - if [ -z "$PR_COMMIT_SHAS" ]; then + PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) + + if [ -z "$PR_COMMIT_SHAS" ]; then echo "No new authored commits found in PR range." - echo "PR is an empty sync or just a merge from upstream chromium repo. No review required." - echo "::set-output name=require_review::false" + echo "PR is an empty sync or just a merge. No review required by this check." + core.setOutput('is_purely_upstream', 'true') # Corrected output name exit 0 - fi - echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" - echo "$PR_COMMIT_SHAS" - - ALL_COMMITS_ARE_UPSTREAM=true - for commit_sha in $PR_COMMIT_SHAS; do + fi + echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" + echo "$PR_COMMIT_SHAS" + + ALL_COMMITS_ARE_UPSTREAM=true + for commit_sha in $PR_COMMIT_SHAS; do echo "Verifying commit $commit_sha against $UPSTREAM_BRANCH_HEAD_REF..." # Check if the commit_sha is an ancestor of the fetched upstream branch's head if git merge-base --is-ancestor "$commit_sha" "$UPSTREAM_BRANCH_HEAD_REF"; then - echo "Commit $commit_sha FOUND in $UPSTREAM_BRANCH_HEAD_REF." + echo "Commit $commit_sha FOUND in $UPSTREAM_BRANCH_HEAD_REF." else - echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." - ALL_COMMITS_ARE_UPSTREAM=false - break # No need to check further, one local commit is enough + echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." + ALL_COMMITS_ARE_UPSTREAM=false + break # No need to check further, one local commit is enough fi - done - - if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then + done + + if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then echo "All commits in this PR originate from the upstream branch ($UPSTREAM_BRANCH_NAME)." - echo "::set-output name=require_review::false" - else + core.setOutput('is_purely_upstream', 'true') # Corrected output name + else echo "This PR contains commits not found on the upstream branch ($UPSTREAM_BRANCH_NAME). Internal review required." - echo "::set-output name=require_review::true" - fi - shell: bash + core.setOutput('is_purely_upstream', 'false') # Corrected output name + fi - name: Determine Review Requirement and Add Labels id: review_decision_and_labeling From 84badb90fd52e06c40061958f1433a6a667a91fe Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 15:53:30 +0100 Subject: [PATCH 59/68] Revert "added some suggested troubleshooting checks and logging" This reverts commit b0da5cb5fcc88efb763aa46a6fa8ab8b7cdb22a8. --- .github/workflows/pr.yml | 153 ++++++++++++--------------------------- 1 file changed, 48 insertions(+), 105 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7569118dc32070..a20afea293b9b8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,132 +24,75 @@ jobs: - name: Check Commit Origin Against Upstream id: commit_origin_check run: | - # --- Initial Git State & Configuration --- - echo "Current directory: $(pwd)" - echo "GitHub Repository: ${{ github.repository }}" - echo "GitHub Workflow: ${{ github.workflow }}" - echo "GitHub Run ID: ${{ github.run_id }}" - echo "GitHub Event Name: ${{ github.event_name }}" - echo "PR Base Ref from event: ${{ github.event.pull_request.base.ref }}" - echo "PR Head Ref from event: ${{ github.event.pull_request.head.ref }}" - echo "PR Head SHA from event: ${{ github.event.pull_request.head.sha }}" - echo "-----------------------------------------" - echo "--- Initial Git Setup by Checkout Action ---" - echo "Current branch (HEAD): $(git rev-parse --abbrev-ref HEAD)" - echo "Current commit (HEAD): $(git rev-parse HEAD)" - echo "Remotes:" - git remote -v - echo "Local branches:" - git branch - echo "All refs (local and remote-tracking):" - git show-ref - echo "-----------------------------------------" - - UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" - UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" - # Define PR base branch name and the full ref for it - PR_BASE_BRANCH_NAME="${{ github.event.pull_request.base.ref }}" - PR_ACTUAL_BASE_REF="refs/remotes/origin/$PR_BASE_BRANCH_NAME" # This is the ref we need to ensure exists - PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" - + UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" + UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" + PR_BASE_REF="origin/${{ github.event.pull_request.base.ref }}" + PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" + echo "Upstream Repository URL: $UPSTREAM_REPO_URL" - echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" - echo "PR Base Branch Name (in fork): $PR_BASE_BRANCH_NAME" - echo "PR Actual Base Ref to use: $PR_ACTUAL_BASE_REF" + echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" # Clarified purpose + echo "PR Base Ref: $PR_BASE_REF" echo "PR Head SHA: $PR_HEAD_SHA" - - # --- Details for 'origin' remote before fetching PR base --- - echo "Showing details for 'origin' remote:" - git remote show origin - echo "Checking if '$PR_ACTUAL_BASE_REF' exists before explicit fetch:" - git rev-parse --verify "$PR_ACTUAL_BASE_REF" || echo "Info: Ref '$PR_ACTUAL_BASE_REF' does NOT exist or is not valid yet." - echo "-------------------------------------------------------" - - # CRUCIAL STEP: Explicitly fetch the PR's base branch from origin to ensure its remote-tracking ref is available - echo "Fetching PR base branch '$PR_BASE_BRANCH_NAME' from origin (refspec: $PR_BASE_BRANCH_NAME:$PR_ACTUAL_BASE_REF)..." - git fetch origin "$PR_BASE_BRANCH_NAME:$PR_ACTUAL_BASE_REF" - echo "Fetch of PR base branch from origin complete." - - # --- Git State After Explicitly Fetching PR Base Branch from origin --- - echo "Remote-tracking branches (git branch -r) after origin fetch:" - git branch -r - echo "All refs (git show-ref) again after origin fetch:" - git show-ref - echo "Verifying ref '$PR_ACTUAL_BASE_REF' (SHA) after origin fetch:" - git rev-parse "$PR_ACTUAL_BASE_REF" || echo "Error: rev-parse failed for '$PR_ACTUAL_BASE_REF' even after explicit origin fetch!" - echo "Verifying ref type '$PR_ACTUAL_BASE_REF' (type) after origin fetch:" - git cat-file -t "$PR_ACTUAL_BASE_REF" || echo "Error: cat-file -t failed for '$PR_ACTUAL_BASE_REF' even after explicit origin fetch!" - echo "---------------------------------------------" - - # Add upstream remote if it doesn't exist - if ! git remote | grep -q '^upstream$'; then + + # Add upstream remote if it doesn't exist + if ! git remote | grep -q '^upstream$'; then echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" git remote add upstream "$UPSTREAM_REPO_URL" - else + else echo "Remote 'upstream' already exists. Setting URL." git remote set-url upstream "$UPSTREAM_REPO_URL" - fi - + fi + echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." # Fetch only the specific target branch from upstream - git fetch upstream "$UPSTREAM_BRANCH_NAME:refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" --no-tags --depth=5000 # Adjust depth as needed - UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" # Reference to the fetched upstream branch head - echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" - git rev-parse --verify "$UPSTREAM_BRANCH_HEAD_REF" || echo "Error: rev-parse failed for '$UPSTREAM_BRANCH_HEAD_REF' after upstream fetch!" - - - # --- Pre-Merge-Base Check --- - echo "Refs being passed to merge-base:" - echo " Ref 1 (PR Base): $PR_ACTUAL_BASE_REF" - echo " Ref 2 (PR Head): $PR_HEAD_SHA" - echo "Checking validity of Ref 1 ($PR_ACTUAL_BASE_REF):" - git rev-parse --verify "$PR_ACTUAL_BASE_REF" || echo "CRITICAL: '$PR_ACTUAL_BASE_REF' is not a valid object name just before merge-base!" - echo "Checking validity of Ref 2 ($PR_HEAD_SHA):" - git rev-parse --verify "$PR_HEAD_SHA" || echo "CRITICAL: '$PR_HEAD_SHA' is not a valid object name just before merge-base!" - echo "---------------------------" - - # Determine the merge base between the PR's base in your fork and the PR's head - MERGE_BASE=$(git merge-base "$PR_ACTUAL_BASE_REF" "$PR_HEAD_SHA") - if [ -z "$MERGE_BASE" ]; then - echo "Error: Could not determine merge base between '$PR_ACTUAL_BASE_REF' and '$PR_HEAD_SHA'." + git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 # Adjust depth as needed + UPSTREAM_BRANCH_HEAD_REF="upstream/$UPSTREAM_BRANCH_NAME" # Reference to the fetched upstream branch head + echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" + + # Determine the merge base between the PR's base in your fork and the PR's head + # This defines the starting point for commits introduced by this PR in your fork. + MERGE_BASE=$(git merge-base "$PR_BASE_REF" "$PR_HEAD_SHA") + if [ -z "$MERGE_BASE" ]; then + echo "Error: Could not determine merge base between $PR_BASE_REF and $PR_HEAD_SHA." echo "This could indicate unrelated histories or issues fetching. For safety, requiring review." - core.setOutput('is_purely_upstream', 'false') # Corrected output name + echo "::set-output name=require_review::true" exit 0 - fi + fi echo "Merge Base for PR commits (relative to fork's base): $MERGE_BASE" - + # Get the list of commit SHAs introduced by this PR in your fork - PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) - - if [ -z "$PR_COMMIT_SHAS" ]; then + PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) + + if [ -z "$PR_COMMIT_SHAS" ]; then echo "No new authored commits found in PR range." - echo "PR is an empty sync or just a merge. No review required by this check." - core.setOutput('is_purely_upstream', 'true') # Corrected output name + echo "PR is an empty sync or just a merge from upstream chromium repo. No review required." + echo "::set-output name=require_review::false" exit 0 - fi - echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" - echo "$PR_COMMIT_SHAS" - - ALL_COMMITS_ARE_UPSTREAM=true - for commit_sha in $PR_COMMIT_SHAS; do + fi + echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" + echo "$PR_COMMIT_SHAS" + + ALL_COMMITS_ARE_UPSTREAM=true + for commit_sha in $PR_COMMIT_SHAS; do echo "Verifying commit $commit_sha against $UPSTREAM_BRANCH_HEAD_REF..." # Check if the commit_sha is an ancestor of the fetched upstream branch's head if git merge-base --is-ancestor "$commit_sha" "$UPSTREAM_BRANCH_HEAD_REF"; then - echo "Commit $commit_sha FOUND in $UPSTREAM_BRANCH_HEAD_REF." + echo "Commit $commit_sha FOUND in $UPSTREAM_BRANCH_HEAD_REF." else - echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." - ALL_COMMITS_ARE_UPSTREAM=false - break # No need to check further, one local commit is enough + echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." + ALL_COMMITS_ARE_UPSTREAM=false + break # No need to check further, one local commit is enough fi - done - - if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then + done + + if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then echo "All commits in this PR originate from the upstream branch ($UPSTREAM_BRANCH_NAME)." - core.setOutput('is_purely_upstream', 'true') # Corrected output name - else + echo "::set-output name=require_review::false" + else echo "This PR contains commits not found on the upstream branch ($UPSTREAM_BRANCH_NAME). Internal review required." - core.setOutput('is_purely_upstream', 'false') # Corrected output name - fi + echo "::set-output name=require_review::true" + fi + shell: bash - name: Determine Review Requirement and Add Labels id: review_decision_and_labeling From 5f9ac249b1c94f61a4c710607d543d03d6a75048 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 15:53:44 +0100 Subject: [PATCH 60/68] Revert "debug whole output dir" This reverts commit 507f15e0fc8db38f65de0a86e803bd3bf8aac884. --- cloudbuild.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b7cdf08ea939bf..cad2f6af898974 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -157,12 +157,11 @@ steps: - '-c' - | set -e - ls -lh /workspace/hopium/src/out/ ls -lh /workspace/hopium/src/out/Debug # 6. Store Build Artifacts -# - name: 'gcr.io/cloud-builders/gsutil' -# id: 'upload-artifact' -# waitFor: [ 'verify-binary' ] -# args: ['-m', 'cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] + - name: 'gcr.io/cloud-builders/gsutil' + id: 'upload-artifact' + waitFor: [ 'verify-binary' ] + args: ['-m', 'cp', '-r', '/workspace/hopium/src/out/Debug/*', 'gs://tmp-totalbrowser-build-artifacts/$TAG_NAME'] From 20b0dafeb7f4a8e32447c976e523e7f8afb49a5e Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 16:08:32 +0100 Subject: [PATCH 61/68] fix issue finding remote head as well as potential timeout issues --- .github/workflows/pr.yml | 114 +++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a20afea293b9b8..ca06e1f274b765 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -7,19 +7,22 @@ on: - opened - reopened - synchronize - - ready_for_review + - ready_for_review # Note: ready_for_review is usually when a PR is marked as not draft. + jobs: conditional_review: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v4 + with: + fetch-depth: 100 - name: Define Upstream Repository and Branch id: upstream_config run: | - echo "::set-output name=upstream_repo_url::https://github.com/chromium/chromium.git" - echo "::set-output name=upstream_branch_name::main" + echo "upstream_repo_url=https://github.com/chromium/chromium.git" >> $GITHUB_OUTPUT + echo "upstream_branch_name=main" >> $GITHUB_OUTPUT - name: Check Commit Origin Against Upstream id: commit_origin_check @@ -30,10 +33,15 @@ jobs: PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" echo "Upstream Repository URL: $UPSTREAM_REPO_URL" - echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" # Clarified purpose - echo "PR Base Ref: $PR_BASE_REF" + echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" + echo "PR Base Ref (in fork): $PR_BASE_REF" echo "PR Head SHA: $PR_HEAD_SHA" + echo "Verifying PR_BASE_REF ($PR_BASE_REF) is a valid commit..." + git rev-parse --verify "$PR_BASE_REF^{commit}" || (echo "Error: $PR_BASE_REF is not a valid commit object name. This usually means 'actions/checkout' did not fetch enough history for the base branch." && exit 1) + echo "Verifying PR_HEAD_SHA ($PR_HEAD_SHA) is a valid commit..." + git rev-parse --verify "$PR_HEAD_SHA^{commit}" || (echo "Error: $PR_HEAD_SHA is not a valid commit object name." && exit 1) + # Add upstream remote if it doesn't exist if ! git remote | grep -q '^upstream$'; then echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" @@ -44,29 +52,28 @@ jobs: fi echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." - # Fetch only the specific target branch from upstream - git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 # Adjust depth as needed - UPSTREAM_BRANCH_HEAD_REF="upstream/$UPSTREAM_BRANCH_NAME" # Reference to the fetched upstream branch head + git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=100 + UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" # Use full ref name for robustness echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" # Determine the merge base between the PR's base in your fork and the PR's head - # This defines the starting point for commits introduced by this PR in your fork. MERGE_BASE=$(git merge-base "$PR_BASE_REF" "$PR_HEAD_SHA") if [ -z "$MERGE_BASE" ]; then echo "Error: Could not determine merge base between $PR_BASE_REF and $PR_HEAD_SHA." echo "This could indicate unrelated histories or issues fetching. For safety, requiring review." - echo "::set-output name=require_review::true" + echo "require_review=true" >> $GITHUB_OUTPUT exit 0 fi - echo "Merge Base for PR commits (relative to fork's base): $MERGE_BASE" + echo "Merge Base for PR commits (relative to fork's base $PR_BASE_REF): $MERGE_BASE" # Get the list of commit SHAs introduced by this PR in your fork + # These are commits from MERGE_BASE (exclusive) to PR_HEAD_SHA (inclusive) PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) if [ -z "$PR_COMMIT_SHAS" ]; then - echo "No new authored commits found in PR range." - echo "PR is an empty sync or just a merge from upstream chromium repo. No review required." - echo "::set-output name=require_review::false" + echo "No new authored commits found in PR range ($MERGE_BASE..$PR_HEAD_SHA)." + echo "PR might be an empty sync or just a merge from upstream. No local review required." + echo "require_review=false" >> $GITHUB_OUTPUT exit 0 fi echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" @@ -75,22 +82,21 @@ jobs: ALL_COMMITS_ARE_UPSTREAM=true for commit_sha in $PR_COMMIT_SHAS; do echo "Verifying commit $commit_sha against $UPSTREAM_BRANCH_HEAD_REF..." - # Check if the commit_sha is an ancestor of the fetched upstream branch's head if git merge-base --is-ancestor "$commit_sha" "$UPSTREAM_BRANCH_HEAD_REF"; then echo "Commit $commit_sha FOUND in $UPSTREAM_BRANCH_HEAD_REF." else echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." ALL_COMMITS_ARE_UPSTREAM=false - break # No need to check further, one local commit is enough + break fi done if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then - echo "All commits in this PR originate from the upstream branch ($UPSTREAM_BRANCH_NAME)." - echo "::set-output name=require_review::false" + echo "All commits in this PR appear to originate from the upstream branch ($UPSTREAM_BRANCH_NAME)." + echo "require_review=false" >> $GITHUB_OUTPUT else echo "This PR contains commits not found on the upstream branch ($UPSTREAM_BRANCH_NAME). Internal review required." - echo "::set-output name=require_review::true" + echo "require_review=true" >> $GITHUB_OUTPUT fi shell: bash @@ -100,39 +106,40 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - const requireReview = ${{ steps.commit_origin_check.outputs.require_review || 'false' }}; + const requireReviewOutputFromCommitCheck = ${{ steps.commit_origin_check.outputs.require_review || 'false' }}; + const prRequiresReview = requireReviewOutputFromCommitCheck === 'true'; + const prNumber = context.issue.number; const owner = context.repo.owner; const repo = context.repo.repo; let labelToAdd = ''; let labelToRemove = ''; - console.log(`PR is Purely Upstream: ${isPurelyUpstream}`); + console.log(`Output from commit_origin_check (require_review string): '${requireReviewOutputFromCommitCheck}'`); + console.log(`Interpreted as prRequiresReview (boolean): ${prRequiresReview}`); - if (requireReview) { - console.log("Decision: PR contains purely upstream changes. Bypass review."); - labelToAdd = 'upstream-sync'; - labelToRemove = 'review-required'; - } else { - console.log("Decision: PR contains local/modified changes. Enforce review."); + if (prRequiresReview) { + console.log("Decision: PR contains local/modified changes. Internal review required."); labelToAdd = 'review-required'; labelToRemove = 'upstream-sync'; + } else { + console.log("Decision: PR is purely upstream. No internal review required by this check."); + labelToAdd = 'upstream-sync'; + labelToRemove = 'review-required'; } - core.setOutput('require_review', requireReview.toString()); + core.setOutput('require_review', prRequiresReview.toString()); - // Add labels if (labelToAdd) { try { await github.rest.issues.addLabels({ owner, repo, issue_number: prNumber, labels: [labelToAdd] }); console.log(`Successfully added label: ${labelToAdd}`); } catch (error) { - console.error(`Error adding label ${labelToAdd}: ${error.message}`); - exit 1 + core.setFailed(`Error adding label ${labelToAdd}: ${error.message}`); // Fail the step on error + return; // Exit script } } - // Remove the other labels if (labelToRemove) { try { const { data: existingLabels } = await github.rest.issues.listLabelsOnIssue({ owner, repo, issue_number: prNumber }); @@ -145,8 +152,7 @@ jobs: console.log(`Label ${labelToRemove} not found on PR, no need to remove.`); } } catch (error) { - // Ignore errors if the label doesn't exist or other minor issues - console.warn(`Warning removing label ${labelToRemove}: ${error.message}`); + console.warn(`Warning removing label ${labelToRemove}: ${error.message}`); // Don't fail for removal issues } } env: @@ -154,7 +160,7 @@ jobs: - name: Enforce Review id: enforce_review - if: always() # Always run this step to make the final decision based on all factors + if: always() uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -164,40 +170,44 @@ jobs: const repo = context.repo.repo; const reviewCompletedLabel = 'review-completed'; const upstreamSyncLabel = 'upstream-sync'; + const reviewRequiredLabel = 'review-required'; - // Get the decision from the previous step - const requiresReview = ${{ steps.review_decision_and_labeling.outputs.require_review }}; + + const reviewDecisionOutput = '${{ steps.review_decision_and_labeling.outputs.require_review }}'; + const needsReviewBasedOnCommits = reviewDecisionOutput === 'true'; - const { data: labels } = await github.rest.issues.listLabelsOnIssue({ + console.log(`Decision from labeling step (needsReviewBasedOnCommits): ${needsReviewBasedOnCommits}`); + + const { data: labelsOnIssue } = await github.rest.issues.listLabelsOnIssue({ owner, repo, issue_number: prNumber, }); - const hasReviewCompletedLabel = labels.some(label => label.name === reviewCompletedLabel); - const hasUpstreamSyncLabel = labels.some(label => label.name === upstreamSyncLabel); + const hasReviewCompletedLabel = labelsOnIssue.some(label => label.name === reviewCompletedLabel); + const hasUpstreamSyncLabel = labelsOnIssue.some(label => label.name === upstreamSyncLabel); + const hasReviewRequiredLabel = labelsOnIssue.some(label => label.name === reviewRequiredLabel); if (hasReviewCompletedLabel) { console.log(`Review confirmed: PR has the '${reviewCompletedLabel}' label. Workflow check passed.`); - if (labels.some(label => label.name === 'review-required')) { + if (hasReviewRequiredLabel) { try { - await github.rest.issues.removeLabel({ owner, repo, issue_number: prNumber, name: 'review-required' }); - console.log("Cleaned up 'review-required' label after completion."); + await github.rest.issues.removeLabel({ owner, repo, issue_number: prNumber, name: reviewRequiredLabel }); + console.log(`Cleaned up '${reviewRequiredLabel}' label after review completion.`); } catch (error) { - console.warn("Could not remove 'review-required' label during cleanup: " + error.message); + console.warn(`Could not remove '${reviewRequiredLabel}' label during cleanup: ${error.message}`); } } return; } - if (hasUpstreamSyncLabel && requiresReview === 'false') { - console.log(`PR is an upstream sync and does not require further review by this action. Workflow check passed.`); + if (hasUpstreamSyncLabel && !needsReviewBasedOnCommits) { + console.log(`PR is an upstream sync and does not require further review by this action (label '${upstreamSyncLabel}' present, commit check confirms no local changes). Workflow check passed.`); return; } - if (requiresReview === 'true') { - console.log(`Internal review is required (PR contains local/modified commits) AND '${reviewCompletedLabel}' label is NOT present. Failing check.`); - core.setFailed(`Review required: PR contains local/modified commits and lacks '${reviewCompletedLabel}' label.`); - } else { - console.log("PR does not require review based on origin and is not marked as completed. Passing by default for this path."); - } + if (needsReviewBasedOnCommits) { + console.log(`Internal review is required (PR contains local/modified commits or commit check decided so) AND '${reviewCompletedLabel}' label is NOT present. Failing check.`); + core.setFailed(`Review required: PR contains local/modified commits (or labeling step determined need for review) and lacks '${reviewCompletedLabel}' label.`); + exit 1; + } \ No newline at end of file From 3d1110e5470481565ec47220a03710cb6eb4b50d Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 16:14:17 +0100 Subject: [PATCH 62/68] try check out with a dept of 0 --- .github/workflows/pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ca06e1f274b765..9461a5b80b5de0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -7,7 +7,7 @@ on: - opened - reopened - synchronize - - ready_for_review # Note: ready_for_review is usually when a PR is marked as not draft. + - ready_for_review jobs: conditional_review: @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 100 + fetch-depth: 0 - name: Define Upstream Repository and Branch id: upstream_config @@ -52,8 +52,8 @@ jobs: fi echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." - git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=100 - UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" # Use full ref name for robustness + git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=0 + UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" # Determine the merge base between the PR's base in your fork and the PR's head From 0bf337d3a440b529b6590cddb837b60bc46a6fb4 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 17:21:03 +0100 Subject: [PATCH 63/68] play about with the git fetch depths to see if we can reduce the execution time for fetching --- .github/workflows/pr.yml | 61 ++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9461a5b80b5de0..2d704da3726d70 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 500 - name: Define Upstream Repository and Branch id: upstream_config @@ -29,20 +29,38 @@ jobs: run: | UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" - PR_BASE_REF="origin/${{ github.event.pull_request.base.ref }}" + PR_BASE_COMMIT_SHA="${{ github.event.pull_request.base.sha }}" PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" + echo "--- Git Diagnostics ---" + echo "Current fetch-depth for actions/checkout is 100 (as per your last message)." + echo "Attempting to ensure specific PR base/head SHAs are locally available and potentially deepen their history slightly." + + # These fetches might be redundant if actions/checkout with fetch-depth:100 was sufficient for these specific SHAs, + # but they act as a safeguard to ensure these critical SHAs are resolvable. + # We fetch with a small depth to get some context around them if they are already known. + git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) failed. This might happen if the SHA is already well-covered by the initial fetch-depth=100, or if the SHA is not found (which would be an issue)." + git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) failed." + echo "-------------------------" + echo "Upstream Repository URL: $UPSTREAM_REPO_URL" echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" - echo "PR Base Ref (in fork): $PR_BASE_REF" - echo "PR Head SHA: $PR_HEAD_SHA" - - echo "Verifying PR_BASE_REF ($PR_BASE_REF) is a valid commit..." - git rev-parse --verify "$PR_BASE_REF^{commit}" || (echo "Error: $PR_BASE_REF is not a valid commit object name. This usually means 'actions/checkout' did not fetch enough history for the base branch." && exit 1) + echo "PR Base Commit SHA (from event.pull_request.base.sha): $PR_BASE_COMMIT_SHA" + echo "PR Head SHA (from event.pull_request.head.sha): $PR_HEAD_SHA" + + echo "Verifying PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) is a valid commit..." + # This SHA comes directly from GitHub's event payload. + # If 'actions/checkout' (with the current fetch-depth: 100) managed to retrieve this commit and its context, this should pass. + git rev-parse --verify "$PR_BASE_COMMIT_SHA^{commit}" || \ + (echo "Error: PR_BASE_COMMIT_SHA '$PR_BASE_COMMIT_SHA' (from event.pull_request.base.sha) could not be resolved to a commit. + This means the commit specified as the PR's base by GitHub is NOT found or NOT resolvable in the local repository checkout with the current fetch-depth (100). + You likely need to INCREASE 'fetch-depth' in the 'actions/checkout' step. Try a larger value (e.g., 200, 500), or use '0' for full history (which is most reliable but potentially slower)." && exit 1) + echo "Verifying PR_HEAD_SHA ($PR_HEAD_SHA) is a valid commit..." - git rev-parse --verify "$PR_HEAD_SHA^{commit}" || (echo "Error: $PR_HEAD_SHA is not a valid commit object name." && exit 1) + git rev-parse --verify "$PR_HEAD_SHA^{commit}" || \ + (echo "Error: PR_HEAD_SHA '$PR_HEAD_SHA' could not be resolved to a commit." && exit 1) - # Add upstream remote if it doesn't exist + # Add upstream remote if ! git remote | grep -q '^upstream$'; then echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" git remote add upstream "$UPSTREAM_REPO_URL" @@ -52,22 +70,24 @@ jobs: fi echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." - git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=0 + # Fetch depth for the *actual* upstream (Chromium) can remain as is. + git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" - # Determine the merge base between the PR's base in your fork and the PR's head - MERGE_BASE=$(git merge-base "$PR_BASE_REF" "$PR_HEAD_SHA") + # Determine the merge base using the specific base commit SHA + echo "Determining merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)..." + MERGE_BASE=$(git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA") if [ -z "$MERGE_BASE" ]; then - echo "Error: Could not determine merge base between $PR_BASE_REF and $PR_HEAD_SHA." - echo "This could indicate unrelated histories or issues fetching. For safety, requiring review." + echo "Error: Could not determine merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)." + echo "This could indicate unrelated histories OR that the fetched history (current depth: 100 for checkout) is insufficient to connect these two commits." + echo "Consider increasing 'fetch-depth' in 'actions/checkout'. For safety, requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 0 + exit 0 # Exiting 0 to allow the workflow to proceed with 'require_review=true' fi - echo "Merge Base for PR commits (relative to fork's base $PR_BASE_REF): $MERGE_BASE" - - # Get the list of commit SHAs introduced by this PR in your fork - # These are commits from MERGE_BASE (exclusive) to PR_HEAD_SHA (inclusive) + echo "Merge Base for PR commits (between $PR_BASE_COMMIT_SHA and $PR_HEAD_SHA): $MERGE_BASE" + + # Get the list of commit SHAs introduced by this PR (commits from MERGE_BASE (exclusive) to PR_HEAD_SHA (inclusive)) PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) if [ -z "$PR_COMMIT_SHAS" ]; then @@ -87,7 +107,7 @@ jobs: else echo "Commit $commit_sha NOT FOUND in $UPSTREAM_BRANCH_HEAD_REF. This PR contains local/modified changes." ALL_COMMITS_ARE_UPSTREAM=false - break + break fi done @@ -98,7 +118,6 @@ jobs: echo "This PR contains commits not found on the upstream branch ($UPSTREAM_BRANCH_NAME). Internal review required." echo "require_review=true" >> $GITHUB_OUTPUT fi - shell: bash - name: Determine Review Requirement and Add Labels id: review_decision_and_labeling From fe4cfb3ea8ac9f5b1c448f7aed4ba80f17f5c8b0 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 17:37:24 +0100 Subject: [PATCH 64/68] added better error handling and increased fetch depth --- .github/workflows/pr.yml | 63 +++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2d704da3726d70..35e988c581b334 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 500 + fetch-depth: 1000 - name: Define Upstream Repository and Branch id: upstream_config @@ -29,18 +29,15 @@ jobs: run: | UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" + PR_BASE_COMMIT_SHA="${{ github.event.pull_request.base.sha }}" PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" echo "--- Git Diagnostics ---" - echo "Current fetch-depth for actions/checkout is 100 (as per your last message)." - echo "Attempting to ensure specific PR base/head SHAs are locally available and potentially deepen their history slightly." - - # These fetches might be redundant if actions/checkout with fetch-depth:100 was sufficient for these specific SHAs, - # but they act as a safeguard to ensure these critical SHAs are resolvable. - # We fetch with a small depth to get some context around them if they are already known. - git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) failed. This might happen if the SHA is already well-covered by the initial fetch-depth=100, or if the SHA is not found (which would be an issue)." - git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) failed." + echo "Current fetch-depth for actions/checkout is 100." + # These fetches ensure a bit of history around the specific SHAs. + git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) failed or had no effect." + git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) failed or had no effect." echo "-------------------------" echo "Upstream Repository URL: $UPSTREAM_REPO_URL" @@ -49,50 +46,62 @@ jobs: echo "PR Head SHA (from event.pull_request.head.sha): $PR_HEAD_SHA" echo "Verifying PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) is a valid commit..." - # This SHA comes directly from GitHub's event payload. - # If 'actions/checkout' (with the current fetch-depth: 100) managed to retrieve this commit and its context, this should pass. git rev-parse --verify "$PR_BASE_COMMIT_SHA^{commit}" || \ - (echo "Error: PR_BASE_COMMIT_SHA '$PR_BASE_COMMIT_SHA' (from event.pull_request.base.sha) could not be resolved to a commit. - This means the commit specified as the PR's base by GitHub is NOT found or NOT resolvable in the local repository checkout with the current fetch-depth (100). - You likely need to INCREASE 'fetch-depth' in the 'actions/checkout' step. Try a larger value (e.g., 200, 500), or use '0' for full history (which is most reliable but potentially slower)." && exit 1) + (echo "Error: PR_BASE_COMMIT_SHA '$PR_BASE_COMMIT_SHA' could not be resolved. Increase 'fetch-depth' in 'actions/checkout'." && exit 1) echo "Verifying PR_HEAD_SHA ($PR_HEAD_SHA) is a valid commit..." git rev-parse --verify "$PR_HEAD_SHA^{commit}" || \ - (echo "Error: PR_HEAD_SHA '$PR_HEAD_SHA' could not be resolved to a commit." && exit 1) + (echo "Error: PR_HEAD_SHA '$PR_HEAD_SHA' could not be resolved." && exit 1) # Add upstream remote if ! git remote | grep -q '^upstream$'; then - echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" git remote add upstream "$UPSTREAM_REPO_URL" else - echo "Remote 'upstream' already exists. Setting URL." git remote set-url upstream "$UPSTREAM_REPO_URL" fi - echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." - # Fetch depth for the *actual* upstream (Chromium) can remain as is. git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" # Determine the merge base using the specific base commit SHA echo "Determining merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)..." - MERGE_BASE=$(git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA") + + # Capture output and exit status of git merge-base + MERGE_BASE_OUTPUT=$(git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA" 2>&1) + MERGE_BASE_STATUS=$? + + if [ $MERGE_BASE_STATUS -ne 0 ]; then + echo "Error: 'git merge-base' failed with status $MERGE_BASE_STATUS." + echo "Command output: $MERGE_BASE_OUTPUT" + echo "This critical failure means a common ancestor could not be found between the PR's base commit ($PR_BASE_COMMIT_SHA) and its head commit ($PR_HEAD_SHA)." + echo "The MOST LIKELY CAUSE is that the history fetched by 'actions/checkout' (current fetch-depth: 100) is too shallow to connect these two commits." + echo "RECOMMENDATION: Significantly increase 'fetch-depth' in the 'actions/checkout' step. Try values like 200, 500, or ideally 0 for full history (though '0' may be slow for Chromium)." + echo "For safety, this PR will be marked as requiring review." + echo "require_review=true" >> $GITHUB_OUTPUT + exit 1 + fi + + # If merge-base succeeded, extract the SHA. + MERGE_BASE=$(echo "$MERGE_BASE_OUTPUT" | awk '{print $1}') + if [ -z "$MERGE_BASE" ]; then - echo "Error: Could not determine merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)." - echo "This could indicate unrelated histories OR that the fetched history (current depth: 100 for checkout) is insufficient to connect these two commits." - echo "Consider increasing 'fetch-depth' in 'actions/checkout'. For safety, requiring review." + # This should ideally not be reached if the status check above is comprehensive, + # but serves as a final validation of the merge base output. + echo "Error: Merge base determined to be empty even though 'git merge-base' command reported success (status 0)." + echo "This is unexpected. Output from merge-base was: '$MERGE_BASE_OUTPUT'" + echo "For safety, requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 0 # Exiting 0 to allow the workflow to proceed with 'require_review=true' + exit 0 fi - echo "Merge Base for PR commits (between $PR_BASE_COMMIT_SHA and $PR_HEAD_SHA): $MERGE_BASE" - # Get the list of commit SHAs introduced by this PR (commits from MERGE_BASE (exclusive) to PR_HEAD_SHA (inclusive)) + echo "Merge Base for PR commits: $MERGE_BASE" + PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) if [ -z "$PR_COMMIT_SHAS" ]; then echo "No new authored commits found in PR range ($MERGE_BASE..$PR_HEAD_SHA)." - echo "PR might be an empty sync or just a merge from upstream. No local review required." + echo "No local review required by this check." echo "require_review=false" >> $GITHUB_OUTPUT exit 0 fi From 9c7656654e225fb48e576210eb73f25f66d5951b Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 17:50:40 +0100 Subject: [PATCH 65/68] increase checkout fetch to 10000 --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 35e988c581b334..aaf56efafc8e35 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 1000 + fetch-depth: 10000 - name: Define Upstream Repository and Branch id: upstream_config @@ -34,7 +34,7 @@ jobs: PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" echo "--- Git Diagnostics ---" - echo "Current fetch-depth for actions/checkout is 100." + echo "Current fetch-depth for actions/checkout is 10000." # These fetches ensure a bit of history around the specific SHAs. git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) failed or had no effect." git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) failed or had no effect." From b18c599a195934079d0583d153b1478b0043e942 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 18:04:11 +0100 Subject: [PATCH 66/68] increase git fetch dept and add some more debugging --- .github/workflows/pr.yml | 65 +++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index aaf56efafc8e35..fb5772b8adced7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 10000 + fetch-depth: 1000000 - name: Define Upstream Repository and Branch id: upstream_config @@ -32,19 +32,23 @@ jobs: PR_BASE_COMMIT_SHA="${{ github.event.pull_request.base.sha }}" PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" - + + # Define the actual fetch depth being used for logging purposes. + # If you make fetch-depth a workflow input later, you can use ${{ inputs.checkout_fetch_depth }} + ACTUAL_FETCH_DEPTH="1000000" + echo "--- Git Diagnostics ---" - echo "Current fetch-depth for actions/checkout is 10000." + echo "Current fetch-depth for actions/checkout is $ACTUAL_FETCH_DEPTH." # These fetches ensure a bit of history around the specific SHAs. git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) failed or had no effect." git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) failed or had no effect." echo "-------------------------" - + echo "Upstream Repository URL: $UPSTREAM_REPO_URL" echo "Target Upstream Branch for Comparison: $UPSTREAM_BRANCH_NAME" echo "PR Base Commit SHA (from event.pull_request.base.sha): $PR_BASE_COMMIT_SHA" echo "PR Head SHA (from event.pull_request.head.sha): $PR_HEAD_SHA" - + echo "Verifying PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) is a valid commit..." git rev-parse --verify "$PR_BASE_COMMIT_SHA^{commit}" || \ (echo "Error: PR_BASE_COMMIT_SHA '$PR_BASE_COMMIT_SHA' could not be resolved. Increase 'fetch-depth' in 'actions/checkout'." && exit 1) @@ -52,7 +56,7 @@ jobs: echo "Verifying PR_HEAD_SHA ($PR_HEAD_SHA) is a valid commit..." git rev-parse --verify "$PR_HEAD_SHA^{commit}" || \ (echo "Error: PR_HEAD_SHA '$PR_HEAD_SHA' could not be resolved." && exit 1) - + # Add upstream remote if ! git remote | grep -q '^upstream$'; then git remote add upstream "$UPSTREAM_REPO_URL" @@ -63,42 +67,49 @@ jobs: git fetch upstream "$UPSTREAM_BRANCH_NAME" --no-tags --depth=1000 UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" - + # Determine the merge base using the specific base commit SHA - echo "Determining merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)..." + echo "Determining merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)... (Using a 5-minute timeout for this command)" - # Capture output and exit status of git merge-base - MERGE_BASE_OUTPUT=$(git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA" 2>&1) - MERGE_BASE_STATUS=$? - - if [ $MERGE_BASE_STATUS -ne 0 ]; then - echo "Error: 'git merge-base' failed with status $MERGE_BASE_STATUS." - echo "Command output: $MERGE_BASE_OUTPUT" + # Capture output and exit status of git merge-base, with a timeout + MERGE_BASE_OUTPUT=$(timeout 300s git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA" 2>&1) + MERGE_BASE_STATUS=$? # $? will be 124 if timeout killed it. + + if [ $MERGE_BASE_STATUS -eq 124 ]; then # Check for timeout + echo "Error: 'git merge-base' command timed out after 5 minutes." + echo "This means finding the common ancestor is taking an exceptionally long time, likely due to very deep or complex history not fully covered by the current fetch-depth ($ACTUAL_FETCH_DEPTH)." + echo "RECOMMENDATION: The most reliable solution is 'fetch-depth: 0' in 'actions/checkout' for full history, or a significantly larger specific depth if '0' is too slow." + echo "For safety, this PR will be marked as requiring review." + echo "require_review=true" >> $GITHUB_OUTPUT + exit 0 # CRITICAL: Exit 0 to allow workflow to proceed with labeling + elif [ $MERGE_BASE_STATUS -ne 0 ]; then # Check for other non-zero exit statuses + echo "Error: 'git merge-base' failed with status $MERGE_BASE_STATUS (not a timeout)." + echo "Command output: $MERGE_BASE_OUTPUT" # This will show any error message from git merge-base itself echo "This critical failure means a common ancestor could not be found between the PR's base commit ($PR_BASE_COMMIT_SHA) and its head commit ($PR_HEAD_SHA)." - echo "The MOST LIKELY CAUSE is that the history fetched by 'actions/checkout' (current fetch-depth: 100) is too shallow to connect these two commits." - echo "RECOMMENDATION: Significantly increase 'fetch-depth' in the 'actions/checkout' step. Try values like 200, 500, or ideally 0 for full history (though '0' may be slow for Chromium)." + echo "The MOST LIKELY CAUSE is that the history fetched by 'actions/checkout' (current fetch-depth: $ACTUAL_FETCH_DEPTH) is too shallow." + echo "RECOMMENDATION: Significantly increase 'fetch-depth' in 'actions/checkout'. Try a much larger value, or use '0' for full history." echo "For safety, this PR will be marked as requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 1 + exit 0 # CRITICAL: Exit 0 to allow workflow to proceed with labeling fi - - # If merge-base succeeded, extract the SHA. + + # If merge-base succeeded (status 0), extract the SHA. MERGE_BASE=$(echo "$MERGE_BASE_OUTPUT" | awk '{print $1}') - + if [ -z "$MERGE_BASE" ]; then - # This should ideally not be reached if the status check above is comprehensive, - # but serves as a final validation of the merge base output. + # This case should ideally not be reached if the status checks above are robust, + # but serves as a final validation if git merge-base succeeded but returned empty output. echo "Error: Merge base determined to be empty even though 'git merge-base' command reported success (status 0)." echo "This is unexpected. Output from merge-base was: '$MERGE_BASE_OUTPUT'" echo "For safety, requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 0 + exit 0 # Exit 0 to allow workflow to proceed fi echo "Merge Base for PR commits: $MERGE_BASE" PR_COMMIT_SHAS=$(git log "$MERGE_BASE".."$PR_HEAD_SHA" --pretty=format:"%H" --no-merges) - + if [ -z "$PR_COMMIT_SHAS" ]; then echo "No new authored commits found in PR range ($MERGE_BASE..$PR_HEAD_SHA)." echo "No local review required by this check." @@ -107,7 +118,7 @@ jobs: fi echo "Commit SHAs in PR to verify against upstream ($UPSTREAM_BRANCH_HEAD_REF):" echo "$PR_COMMIT_SHAS" - + ALL_COMMITS_ARE_UPSTREAM=true for commit_sha in $PR_COMMIT_SHAS; do echo "Verifying commit $commit_sha against $UPSTREAM_BRANCH_HEAD_REF..." @@ -119,7 +130,7 @@ jobs: break fi done - + if [[ "$ALL_COMMITS_ARE_UPSTREAM" == "true" ]]; then echo "All commits in this PR appear to originate from the upstream branch ($UPSTREAM_BRANCH_NAME)." echo "require_review=false" >> $GITHUB_OUTPUT From c79413f39b3b2cbcb500c89fa3cdc1e46b4ba133 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 18:20:02 +0100 Subject: [PATCH 67/68] reduced fetch dept --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fb5772b8adced7..0b301a06f941f3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 1000000 + fetch-depth: 1000 - name: Define Upstream Repository and Branch id: upstream_config @@ -35,7 +35,7 @@ jobs: # Define the actual fetch depth being used for logging purposes. # If you make fetch-depth a workflow input later, you can use ${{ inputs.checkout_fetch_depth }} - ACTUAL_FETCH_DEPTH="1000000" + ACTUAL_FETCH_DEPTH="1000" echo "--- Git Diagnostics ---" echo "Current fetch-depth for actions/checkout is $ACTUAL_FETCH_DEPTH." From f2a9e72b76a53cebf536517bc3f01d69019b0564 Mon Sep 17 00:00:00 2001 From: "harry.overton@protected.net" Date: Wed, 7 May 2025 18:29:31 +0100 Subject: [PATCH 68/68] more debug steps... --- .github/workflows/pr.yml | 89 +++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0b301a06f941f3..c3928984ab13c3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,21 +27,44 @@ jobs: - name: Check Commit Origin Against Upstream id: commit_origin_check run: | + # Ensure script exits on error by default; we will manage specific command failures. + set -e + UPSTREAM_REPO_URL="${{ steps.upstream_config.outputs.upstream_repo_url }}" UPSTREAM_BRANCH_NAME="${{ steps.upstream_config.outputs.upstream_branch_name }}" PR_BASE_COMMIT_SHA="${{ github.event.pull_request.base.sha }}" PR_HEAD_SHA="${{ github.event.pull_request.head.sha }}" - # Define the actual fetch depth being used for logging purposes. - # If you make fetch-depth a workflow input later, you can use ${{ inputs.checkout_fetch_depth }} - ACTUAL_FETCH_DEPTH="1000" + # Set actual fetch depth for logging. + # If you make fetch-depth a workflow input like 'inputs.checkout_fetch_depth', use that here. + # Otherwise, ensure this matches the value in your 'actions/checkout' step. + ACTUAL_FETCH_DEPTH="1000" # As per your last log for this PR echo "--- Git Diagnostics ---" echo "Current fetch-depth for actions/checkout is $ACTUAL_FETCH_DEPTH." - # These fetches ensure a bit of history around the specific SHAs. - git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) failed or had no effect." - git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) failed or had no effect." + echo "PATH is: $PATH" + echo "Checking for timeout command..." + if ! which timeout > /dev/null; then + echo "Error: 'timeout' command not found in PATH." + # As a fallback, try a common path if 'which' fails or PATH is minimal + if [ -x "/usr/bin/timeout" ]; then + echo "Found timeout at /usr/bin/timeout." + TIMEOUT_CMD="/usr/bin/timeout" + else + echo "FATAL: 'timeout' command is not available. Cannot proceed safely with merge-base." + exit 1 + fi + else + TIMEOUT_CMD="timeout" # Use 'timeout' if found in PATH + echo "'timeout' command found in PATH." + fi + $TIMEOUT_CMD --version || (echo "Error: '$TIMEOUT_CMD --version' failed." && exit 1) + echo "Timeout command seems available and runnable." + + echo "Attempting to deepen fetch for specific SHAs (safeguard)..." + git fetch origin --no-tags --depth=5 "$PR_BASE_COMMIT_SHA" || echo "Warning: Deepening fetch for PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) had no effect or failed (might be ok if SHA is already well-fetched)." + git fetch origin --no-tags --depth=5 "$PR_HEAD_SHA" || echo "Warning: Deepening fetch for PR_HEAD_SHA ($PR_HEAD_SHA) had no effect or failed." echo "-------------------------" echo "Upstream Repository URL: $UPSTREAM_REPO_URL" @@ -50,17 +73,17 @@ jobs: echo "PR Head SHA (from event.pull_request.head.sha): $PR_HEAD_SHA" echo "Verifying PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) is a valid commit..." - git rev-parse --verify "$PR_BASE_COMMIT_SHA^{commit}" || \ - (echo "Error: PR_BASE_COMMIT_SHA '$PR_BASE_COMMIT_SHA' could not be resolved. Increase 'fetch-depth' in 'actions/checkout'." && exit 1) + git rev-parse --verify "$PR_BASE_COMMIT_SHA^{commit}" || (echo "Error: PR_BASE_COMMIT_SHA '$PR_BASE_COMMIT_SHA' could not be resolved." && exit 1) echo "Verifying PR_HEAD_SHA ($PR_HEAD_SHA) is a valid commit..." - git rev-parse --verify "$PR_HEAD_SHA^{commit}" || \ - (echo "Error: PR_HEAD_SHA '$PR_HEAD_SHA' could not be resolved." && exit 1) + git rev-parse --verify "$PR_HEAD_SHA^{commit}" || (echo "Error: PR_HEAD_SHA '$PR_HEAD_SHA' could not be resolved." && exit 1) # Add upstream remote if ! git remote | grep -q '^upstream$'; then + echo "Adding remote 'upstream' for $UPSTREAM_REPO_URL" git remote add upstream "$UPSTREAM_REPO_URL" else + echo "Remote 'upstream' already exists. Setting URL." git remote set-url upstream "$UPSTREAM_REPO_URL" fi echo "Fetching from upstream remote (target branch: $UPSTREAM_BRANCH_NAME)..." @@ -68,42 +91,50 @@ jobs: UPSTREAM_BRANCH_HEAD_REF="refs/remotes/upstream/$UPSTREAM_BRANCH_NAME" echo "Successfully fetched $UPSTREAM_BRANCH_HEAD_REF" - # Determine the merge base using the specific base commit SHA - echo "Determining merge base between PR_BASE_COMMIT_SHA ($PR_BASE_COMMIT_SHA) and PR_HEAD_SHA ($PR_HEAD_SHA)... (Using a 5-minute timeout for this command)" + echo "Attempting to run: $TIMEOUT_CMD 300s git merge-base $PR_BASE_COMMIT_SHA $PR_HEAD_SHA" + MERGE_BASE_OUTPUT="" + MERGE_BASE_STATUS=0 # Default to success - # Capture output and exit status of git merge-base, with a timeout - MERGE_BASE_OUTPUT=$(timeout 300s git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA" 2>&1) - MERGE_BASE_STATUS=$? # $? will be 124 if timeout killed it. + # Execute the command and explicitly manage its potential failure + if MERGE_BASE_OUTPUT=$($TIMEOUT_CMD 300s git merge-base "$PR_BASE_COMMIT_SHA" "$PR_HEAD_SHA" 2>&1); then + MERGE_BASE_STATUS=0 + echo "git merge-base command itself reported success (exit status 0)." + else + MERGE_BASE_STATUS=$? # Capture actual exit status from timeout or git merge-base + echo "git merge-base command (or timeout wrapper) reported failure. Captured status: $MERGE_BASE_STATUS." + fi - if [ $MERGE_BASE_STATUS -eq 124 ]; then # Check for timeout - echo "Error: 'git merge-base' command timed out after 5 minutes." + echo "Completed git merge-base attempt. Raw Status: $MERGE_BASE_STATUS. Raw Output: [$MERGE_BASE_OUTPUT]" + + # Now check the status + if [ $MERGE_BASE_STATUS -eq 124 ]; then + echo "Error: 'git merge-base' command TIMED OUT after 5 minutes (status 124 from timeout command)." echo "This means finding the common ancestor is taking an exceptionally long time, likely due to very deep or complex history not fully covered by the current fetch-depth ($ACTUAL_FETCH_DEPTH)." echo "RECOMMENDATION: The most reliable solution is 'fetch-depth: 0' in 'actions/checkout' for full history, or a significantly larger specific depth if '0' is too slow." echo "For safety, this PR will be marked as requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 0 # CRITICAL: Exit 0 to allow workflow to proceed with labeling - elif [ $MERGE_BASE_STATUS -ne 0 ]; then # Check for other non-zero exit statuses - echo "Error: 'git merge-base' failed with status $MERGE_BASE_STATUS (not a timeout)." - echo "Command output: $MERGE_BASE_OUTPUT" # This will show any error message from git merge-base itself - echo "This critical failure means a common ancestor could not be found between the PR's base commit ($PR_BASE_COMMIT_SHA) and its head commit ($PR_HEAD_SHA)." - echo "The MOST LIKELY CAUSE is that the history fetched by 'actions/checkout' (current fetch-depth: $ACTUAL_FETCH_DEPTH) is too shallow." + exit 0 + elif [ $MERGE_BASE_STATUS -ne 0 ]; then + echo "Error: 'git merge-base' command FAILED with status $MERGE_BASE_STATUS (not a timeout)." + echo "Command output (if any) from git merge-base: $MERGE_BASE_OUTPUT" + echo "This critical failure means a common ancestor could not be found between the PR's base commit ($PR_BASE_COMMIT_SHA) and its head commit ($PR_HEAD_SHA), or another git error occurred." + echo "The MOST LIKELY CAUSE (if output is empty or indicates no common ancestor) is that the history fetched by 'actions/checkout' (current fetch-depth: $ACTUAL_FETCH_DEPTH) is too shallow." echo "RECOMMENDATION: Significantly increase 'fetch-depth' in 'actions/checkout'. Try a much larger value, or use '0' for full history." echo "For safety, this PR will be marked as requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 0 # CRITICAL: Exit 0 to allow workflow to proceed with labeling + exit 0 fi - # If merge-base succeeded (status 0), extract the SHA. + echo "git merge-base command seems to have succeeded with status 0." + # If successful, MERGE_BASE_OUTPUT contains the SHA. MERGE_BASE=$(echo "$MERGE_BASE_OUTPUT" | awk '{print $1}') if [ -z "$MERGE_BASE" ]; then - # This case should ideally not be reached if the status checks above are robust, - # but serves as a final validation if git merge-base succeeded but returned empty output. - echo "Error: Merge base determined to be empty even though 'git merge-base' command reported success (status 0)." + echo "Error: Merge base is empty even though git merge-base reported success (status 0)." echo "This is unexpected. Output from merge-base was: '$MERGE_BASE_OUTPUT'" echo "For safety, requiring review." echo "require_review=true" >> $GITHUB_OUTPUT - exit 0 # Exit 0 to allow workflow to proceed + exit 0 fi echo "Merge Base for PR commits: $MERGE_BASE"