From e012eb2b5c41ba531d3d43e7c8b51f635cbf3166 Mon Sep 17 00:00:00 2001
From: Gregory Guterman <guterman@google.com>
Date: Wed, 20 Nov 2024 21:46:24 +0000
Subject: [PATCH] Reland "Reland "[clank] Checkout AFDO profiles iff
checkout_pgo_profiles = true""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 0cb273dd35d9fa27642bceeaf28f6c42d64d221a.
Reason for revert: Fixing the builders that broke last time
Original change's description:
> Revert "Reland "[clank] Checkout AFDO profiles iff checkout_pgo_profiles = true""
>
> This reverts commit 7a975a262e8c6e4868b9a8ab0d112918498b908a.
>
> Reason for revert: Build failing on arm-builder-rel: http://ci.chromium.org/b/8731251616867074417
>
> Original change's description:
> > Reland "[clank] Checkout AFDO profiles iff checkout_pgo_profiles = true"
> >
> > This reverts commit 6f96c16580de1501fc8a21aab6120e8d462c903f.
> >
> > Reason for revert: This reland adds the missing profile
> >
> > Original change's description:
> > > Revert "[clank] Checkout AFDO profiles iff checkout_pgo_profiles = true"
> > >
> > > This reverts commit 5aa57b1b883e512e83693b4fabc29ece81216877.
> > >
> > > Reason for revert: Fix failing in https://ci.chromium.org/ui/p/chromium/builders/ci/android-official/22666/overview
> > >
> > > Original change's description:
> > > > [clank] Checkout AFDO profiles iff checkout_pgo_profiles = true
> > > >
> > > > These profiles are only needed on official builds. They're a waste to checkout unless actually needed.
> > > >
> > > > Checking them out on every workspace init also poses an issue for Cider integration. The Cider workflow involves creating many workspaces, which would eat up all the disk space if each workspace downloaded these large profiles.
> > > >
> > > > I manually checked all the android official and continuous official builders, and they set this variable to true. E.g. https://logs.chromium.org/logs/chrome/buildbucket/cr-buildbucket/8731415215201822465/+/u/gclient_config/config
> > > >
> > > > Change-Id: I8de8460ac0a920fa15eb2c84740420cdeb0e37b4
> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6018926
> > > > Commit-Queue: Gregory Guterman <guterman@google.com>
> > > > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > > > Reviewed-by: George Burgess <gbiv@chromium.org>
> > > > Reviewed-by: Gary Tong <gatong@chromium.org>
> > > > Cr-Commit-Position: refs/heads/main@{#1382478}
> > >
> > > Change-Id: Ibaa8c4c5bf14f83b447e8162bf36f97bbb2dfec8
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6023545
> > > Owners-Override: Aya Elgendy <ayag@chromium.org>
> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Auto-Submit: Aya Elgendy <ayag@chromium.org>
> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Cr-Commit-Position: refs/heads/main@{#1382921}
> >
> > Change-Id: Ibc88f3c70b4fd1675c24275667105f0e28cf669c
> > Bug: b:375437208
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6023512
> > Commit-Queue: Gregory Guterman <guterman@google.com>
> > Reviewed-by: George Burgess <gbiv@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1383310}
>
> Bug: b:375437208
> Change-Id: Ida6b1c51c79b91a1b5b1dba168087c0457f08f2e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6023557
> Owners-Override: Peter Pakkenberg <pbirk@chromium.org>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Peter Pakkenberg <pbirk@chromium.org>
> Auto-Submit: Peter Pakkenberg <pbirk@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1383500}
Bug: b:375437208
Change-Id: Ifd05d9d701d707408081333d1e0a45a82d39d922
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6024088
Commit-Queue: Gregory Guterman <guterman@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Aya Elgendy <ayag@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1385897}
---
DEPS | 4 ++--
.../generated/builders/ci/android-official/properties.json | 3 ++-
.../generated/builders/try/android-official/properties.json | 3 ++-
infra/config/subprojects/chromium/ci/chromium.star | 1 +
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/DEPS b/DEPS
index 3ae9871e504c6..a10f525364c5e 100644
--- a/DEPS
+++ b/DEPS
@@ -5117,7 +5117,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',
@@ -5129,7 +5129,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',
diff --git a/infra/config/generated/builders/ci/android-official/properties.json b/infra/config/generated/builders/ci/android-official/properties.json
index 8f713274476b4..9f189a254c8fe 100644
--- a/infra/config/generated/builders/ci/android-official/properties.json
+++ b/infra/config/generated/builders/ci/android-official/properties.json
@@ -28,7 +28,8 @@
},
"legacy_gclient_config": {
"apply_configs": [
- "android"
+ "android",
+ "checkout_pgo_profiles"
],
"config": "chromium"
}
diff --git a/infra/config/generated/builders/try/android-official/properties.json b/infra/config/generated/builders/try/android-official/properties.json
index 3f884ce86d15b..01b42e7d606ac 100644
--- a/infra/config/generated/builders/try/android-official/properties.json
+++ b/infra/config/generated/builders/try/android-official/properties.json
@@ -28,7 +28,8 @@
},
"legacy_gclient_config": {
"apply_configs": [
- "android"
+ "android",
+ "checkout_pgo_profiles"
],
"config": "chromium"
}
diff --git a/infra/config/subprojects/chromium/ci/chromium.star b/infra/config/subprojects/chromium/ci/chromium.star
index adcf49cc9243f..769c600a445c7 100644
--- a/infra/config/subprojects/chromium/ci/chromium.star
+++ b/infra/config/subprojects/chromium/ci/chromium.star
@@ -297,6 +297,7 @@ ci.builder(
config = "chromium",
apply_configs = [
"android",
+ "checkout_pgo_profiles",
],
),
chromium_config = builder_config.chromium_config(