Commit b150ba4c authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Android: Clean up build output

Ignores output about ignored configuration for attribute. See bug for
more examples.

Bug: 961382
Change-Id: Icec399f78e249e4bb00757e525a7da0e15a10fcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1602287
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: default avatarMohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658249}
parent 6fbee1c4
...@@ -535,11 +535,14 @@ def _CompileDeps(aapt2_path, dep_subdirs, temp_dir): ...@@ -535,11 +535,14 @@ def _CompileDeps(aapt2_path, dep_subdirs, temp_dir):
partial_path = os.path.join(partials_dir, dirname + '.zip') partial_path = os.path.join(partials_dir, dirname + '.zip')
compile_command = (partial_compile_command + compile_command = (partial_compile_command +
['--dir', directory, '-o', partial_path]) ['--dir', directory, '-o', partial_path])
# There are resources targeting API-versions lower than our minapi. For
# various reasons it's easier to let aapt2 ignore these than for us to
# remove them from our build (e.g. it's from a 3rd party library).
build_utils.CheckOutput( build_utils.CheckOutput(
compile_command, compile_command,
stderr_filter=lambda output: stderr_filter=lambda output:
build_utils.FilterLines( build_utils.FilterLines(
output, r'ignoring configuration .* for styleable')) output, r'ignoring configuration .* for (styleable|attribute)'))
# Sorting the files in the partial ensures deterministic output from the # Sorting the files in the partial ensures deterministic output from the
# aapt2 link step which uses order of files in the partial. # aapt2 link step which uses order of files in the partial.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment