Commit c27cab5b authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Use ninja pool for dex merge actions

Another attempt at preventing OOM for android-archive-rel

Bug: 1098333
Change-Id: I8307209b7ce9ef7220bb0e2cbb14becce5e03a1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2361182Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799189}
parent 6d708617
...@@ -1626,6 +1626,15 @@ if (enable_java_templates) { ...@@ -1626,6 +1626,15 @@ if (enable_java_templates) {
outputs = [ invoker.output ] outputs = [ invoker.output ]
inputs = [ _r8_path ] inputs = [ _r8_path ]
if (!_is_library) {
# http://crbug.com/725224. Fix for bots running out of memory.
if (defined(java_cmd_pool_size)) {
pool = "//build/config/android:java_cmd_pool($default_toolchain)"
} else {
pool = "//build/toolchain:link_pool($default_toolchain)"
}
}
args = [ args = [
"--depfile", "--depfile",
rebase_path(depfile, root_build_dir), rebase_path(depfile, root_build_dir),
......
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