0

Migrate doclava to first class DEP

Change-Id: Ifd9077aa47def6a2b72788805b835523759bbd04
Bug: 375437208
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5966961
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Auto-Submit: Gregory Guterman <guterman@google.com>
Commit-Queue: Gregory Guterman <guterman@google.com>
Cr-Commit-Position: refs/heads/main@{#1376539}
This commit is contained in:
Greg Guterman
2024-10-31 19:57:19 +00:00
committed by Chromium LUCI CQ
parent f6d0d816e1
commit 357a169cd8
3 changed files with 14 additions and 43 deletions
DEPS
build/android
buildtools/android

24
DEPS

@ -524,6 +524,7 @@ allowed_hosts = [
'chromium-ads-detection',
'chromium-browser-clang',
'chromium-clang-format',
'chromium-doclava',
'chromium-nodejs',
'chrome-linux-sysroot',
'chromium-fonts',
@ -4112,6 +4113,19 @@ deps = {
'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' + '@' +
@ -5143,16 +5157,6 @@ hooks = [
'--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',
'pattern': '.',

@ -1,32 +0,0 @@
#!/usr/bin/env python3
# Copyright 2016 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Minimal tool to download doclava from Google storage when building for
Android."""
import os
import subprocess
import sys
def main():
# Some Windows bots inadvertently have third_party/android_sdk installed,
# but are unable to run download_from_google_storage because depot_tools
# is not in their path, so avoid failure and bail.
if sys.platform == 'win32':
return 0
subprocess.check_call([
'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-doclava',
'--extract',
'-s',
os.path.join(os.path.dirname(__file__), '..', '..', 'buildtools',
'android', 'doclava.tar.gz.sha1')])
return 0
if __name__ == '__main__':
sys.exit(main())

@ -1 +0,0 @@
1931becb8a8e21685f39c62854e9e814d64ccf1a