diff options
| author | John Budorick <jbudorick@chromium.org> | 2020-09-07 16:41:20 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-15 06:21:24 +0000 |
| commit | 33503d9c9c63b1b540cda31f578a0af98e8d7a3c (patch) | |
| tree | 87d4b95dcc553b1ae157278c148bb5b519f39b85 /tools_libyuv | |
| parent | 165f39cd1292c1ff210f6916e4483dd75fa03c13 (diff) | |
| download | libyuv-33503d9c9c63b1b540cda31f578a0af98e8d7a3c.tar.gz | |
Fix libyuv deps autoroll and roll chromium deps.
This includes:
- fixing a handrolled raw exec-based DEPS parser that was failing
to parse Str, similar to crbug.com/1106435.
- rolling chromium forward by nearly a year. (The last roll that
landed was crrev.com/c/1797295). This required a bunch of changes in
order to be able to successfully sync, run gn, and compile:
- switching the mirrors for three repositories to match chromium,
which switched in crrev.com/c/2062580.
- making libyuv write an empty gclient_args file
- adding a few build_override gn arguments
- adding nasm as a deps entry, as it's now required by libjpeg_turbo
- android:
- adding jdk, libunwindstack, and turbine
- rolling the android sdk
- rolling bazel and r8
- rolling the cipd packages managed by third_party/android_deps
- adding six and requests to .vpython for the test runner
- switching to memcpy in a few places to avoid SIGBUS errors on
arm due to unaligned reads
- linux:
- checking out instrumented libraries for msan (including adding
depot_tools to deps for the hook)
- mac:
- adding mac_xcode_version to gclient_gn_args
- win:
- limit mac_toolchain to checkout_mac
Bug: 1063768, 1097306
Change-Id: Idd86fffcdac174fd2f7899243a56af4f1ed8077e
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2384320
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Diffstat (limited to 'tools_libyuv')
| -rwxr-xr-x | tools_libyuv/autoroller/roll_deps.py | 5 | ||||
| -rw-r--r-- | tools_libyuv/autoroller/unittests/testdata/DEPS | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools_libyuv/autoroller/roll_deps.py b/tools_libyuv/autoroller/roll_deps.py index 2b95e302..9b9660de 100755 --- a/tools_libyuv/autoroller/roll_deps.py +++ b/tools_libyuv/autoroller/roll_deps.py @@ -37,7 +37,7 @@ CHROMIUM_LOG_TEMPLATE = CHROMIUM_SRC_URL + '/+log/%s' CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s' COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$') -CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION = \'([0-9a-z]+)\'$') +CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION = \'([0-9a-z-]+)\'$') ROLL_BRANCH_NAME = 'roll_chromium_revision' SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -69,6 +69,7 @@ def ParseDepsDict(deps_content): local_scope = {} global_scope = { 'Var': VarLookup(local_scope), + 'Str': lambda s: s, 'deps_os': {}, } exec(deps_content, global_scope, local_scope) @@ -274,7 +275,7 @@ def CalculateChangedClang(new_cr_rev): match = CLANG_REVISION_RE.match(line) if match: return match.group(1) - raise RollError('Could not parse Clang revision!') + raise RollError('Could not parse Clang revision from:\n' + '\n'.join(' ' + l for l in lines)) with open(CLANG_UPDATE_SCRIPT_LOCAL_PATH, 'rb') as f: current_lines = f.readlines() diff --git a/tools_libyuv/autoroller/unittests/testdata/DEPS b/tools_libyuv/autoroller/unittests/testdata/DEPS index 9fbb48a7..4f45860c 100644 --- a/tools_libyuv/autoroller/unittests/testdata/DEPS +++ b/tools_libyuv/autoroller/unittests/testdata/DEPS @@ -3,6 +3,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', 'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d', + 'ignored_str': Str(''), } deps = { |