Skip to content

Commit

Permalink
Add/Pull a CIPD package that holds AFDO profiles.
Browse files Browse the repository at this point in the history
Scrubbed Chrome OS profiles (well, one at the moment) live in
chrome/android/profiles. Hopefully we won't need to scrub them soon.

In order to do AFDO on Chromium, we need to pull them locally.

size wins are observed as with unscrubbed profiles on Chrome.apk
(assuming the profile actually gets turned on, which is moved to
another patch).

Bug: 794750
Test: ChromePublic.apk builds after `gclient sync`. Similar perf/binary
Change-Id: I9cc034ca21e948b372944b6bcdc8c5055fd71ca8
Reviewed-on: https://chromium-review.googlesource.com/843774
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526794}
  • Loading branch information
George Burgess IV authored and Commit Bot committed Jan 3, 2018
1 parent de864da commit c8ff4dc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ vs-chromium-project.txt
/c
/cdm
/ceee/internal/
/chrome/android/profiles/chrome-profile-*.prof
/chrome/angle_unittests_run.xml
/chrome/build/chrome.x64.orderfile
/chrome/build/chrome.x86.orderfile
Expand Down
7 changes: 7 additions & 0 deletions build/cipd/android/android.ensure
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,10 @@ chromium/third_party/sqlite4java version:0.282-cr0
@Subdir third_party/xstream
chromium/third_party/xstream version:1.4.8-cr0

# Three unchanging lines
# avoid the horror that is
# endless merge conflicts

@Subdir chrome/android/profiles
chromium/afdo/profiles/android version:3309

13 changes: 13 additions & 0 deletions chrome/android/profiles/cipd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2018 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# To create a CIPD package, run the following command.
# cipd create --pkg-def cipd.yaml -tag version:version-of-afdo-profile
package: chromium/afdo/profiles/android
description: AFDO profiles collected for Chromium on Android

# FIXME(gbiv): When we can specify dependencies on the profile in the build
# system, settle on a profile name that doesn't include the version.
data:
- file: chrome-profile-3309-text.prof

0 comments on commit c8ff4dc

Please sign in to comment.