chromium/src
0
Fork 0
Code Activity

Android: Add cmdline-tools to android-sdk-packager

Browse Source 
Similar to https://crrev.com/c/1803895, now that cmdline-tools is no
longer in canary channel, we can add it to the rest of the sdk packages.

Updated instructions for updating and adding new packages.

Fix android-sdk-packager build since it was broken by android releasing
bugs starting early May.

Bug: 1093896
Change-Id: I800b285a4e03193f4b9c3c67a44f55eb4b77fd6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2241994
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Haiyang Pan <hypan@google.com>
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#777426}
This commit is contained in:
Peter Wen
2020-06-11 19:01:44 +00:00
committed by Commit Bot
parent 4bdd757cf3
commit f38090f17f
3 changed files with 27 additions and 13 deletions
infra/config
generated
cr-buildbucket.cfg
subprojects
chromium
master-only
ci.star
third_party/android_sdk
README.chromium

2
infra/config/generated/cr-buildbucket.cfg

@ -9687,7 +9687,7 @@ buckets {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "packages:[{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/25.0.2.yaml\",\"sdk_package_name\":\"build-tools;25.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/27.0.3.yaml\",\"sdk_package_name\":\"build-tools;27.0.3\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/29.0.2.yaml\",\"sdk_package_name\":\"build-tools;29.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/emulator.yaml\",\"sdk_package_name\":\"emulator\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/extras/google/gcm.yaml\",\"sdk_package_name\":\"extras;google;gcm\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/patcher/v4.yaml\",\"sdk_package_name\":\"patcher;v4\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-23.yaml\",\"sdk_package_name\":\"platforms;android-23\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-28.yaml\",\"sdk_package_name\":\"platforms;android-28\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-29.yaml\",\"sdk_package_name\":\"platforms;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platform-tools.yaml\",\"sdk_package_name\":\"platform-tools\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-28.yaml\",\"sdk_package_name\":\"sources;android-28\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-29.yaml\",\"sdk_package_name\":\"sources;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-23/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-23;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-28;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-28;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis_playstore;x86\"}]"
properties_j: "packages:[{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/25.0.2.yaml\",\"sdk_package_name\":\"build-tools;25.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/27.0.3.yaml\",\"sdk_package_name\":\"build-tools;27.0.3\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/29.0.2.yaml\",\"sdk_package_name\":\"build-tools;29.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/cmdline-tools.yaml\",\"sdk_package_name\":\"cmdline-tools;latest\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/emulator.yaml\",\"sdk_package_name\":\"emulator\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/extras/google/gcm.yaml\",\"sdk_package_name\":\"extras;google;gcm\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/patcher/v4.yaml\",\"sdk_package_name\":\"patcher;v4\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-23.yaml\",\"sdk_package_name\":\"platforms;android-23\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-28.yaml\",\"sdk_package_name\":\"platforms;android-28\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-29.yaml\",\"sdk_package_name\":\"platforms;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platform-tools.yaml\",\"sdk_package_name\":\"platform-tools\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-28.yaml\",\"sdk_package_name\":\"sources;android-28\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-29.yaml\",\"sdk_package_name\":\"sources;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-23/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-23;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-28;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis_playstore;x86\"}]"
}
execution_timeout_secs: 10800
build_numbers: YES

13
infra/config/subprojects/chromium/master-only/ci.star

@ -92,6 +92,10 @@ ci.builder(
'sdk_package_name': 'build-tools;29.0.2',
'cipd_yaml': 'third_party/android_sdk/cipd/build-tools/29.0.2.yaml'
},
{
'sdk_package_name': 'cmdline-tools;latest',
'cipd_yaml': 'third_party/android_sdk/cipd/cmdline-tools.yaml'
},
{
'sdk_package_name': 'emulator',
'cipd_yaml': 'third_party/android_sdk/cipd/emulator.yaml'
@ -132,10 +136,11 @@ ci.builder(
'sdk_package_name': 'system-images;android-23;google_apis;x86',
'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-23/google_apis/x86.yaml'
},
{
'sdk_package_name': 'system-images;android-28;google_apis;x86',
'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml'
},
# Missing due to http://b/155847875.
#{
# 'sdk_package_name': 'system-images;android-28;google_apis;x86',
# 'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml'
#},
{
'sdk_package_name': 'system-images;android-28;google_apis_playstore;x86',
'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml'

25
third_party/android_sdk/README.chromium vendored

@ -21,12 +21,21 @@ Local Modifications:
- Added extras/chromium/.
Update Instructions:
* public/tools/bin/sdkmanager --list # Look for "Installed packages:"
* For cmdline-tools run: sdkmanager --channel=3 'cmdline-tools;latest'
* Prepare the CIPD yaml files for packages that need update and add them
to android-sdk-packager buildbucket configuation file.
Submit the changes into gerrit (See crrev.com/c/1803895 as a reference)
* Wait until the builder android-sdk-packager creates new CIPD packages
* Update //DEPS with InstanceIds from the CIPD
* Update versions in this README.chromium.
* What to update:
* public/cmdline-tools/latest/bin/sdkmanager --list
* Note the 'Available Updates:' section of the output.
* How to update packages:
* Find the latest build on the android-sdk-packager builder. Get the CIPD
instance id from its logs and update //DEPS:
https://ci.chromium.org/p/chromium/builders/ci/android-sdk-packager
* Use `public/cmdline-tools/latest/bin/sdkmanager platform-tools` to make
sure that it is the latest version.
* Update this file with the new version.
* Adding new sdk packages:
* Prepare the CIPD yaml files for packages in the cipd/ directory.
* Add them to android-sdk-packager buildbucket configuation file:
infra/config/subprojects/chromium/master-only/ci.star
* Submit the changes into gerrit (See crrev.com/c/2241994 as a reference)
* Follow the update instructions to get a build from the CI builder.
* Updating this file:
* The overall Version field should correspond to the Platform API version.