[code coverage] Add 2 more args for merge script to merge Java coverage data

Merge script cl: https://chromium-review.googlesource.com/c/chromium/src/+/1682549

Bug: 972171
Change-Id: Ifb4664bdeeff91bb6a186ca4308481bed8867835
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1682703
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Yun Liu <yliuyliu@google.com>
1 file changed
tree: d12098cbbfe956d6a9bb761ab4f8d582b82c51ac
  1. infra/
  2. masters/
  3. scripts/
  4. site_config/
  5. slave/
  6. tests/
  7. third_party/
  8. .gitattributes
  9. .gitignore
  10. .vpython
  11. codereview.settings
  12. DEPS
  13. environment.cfg.py
  14. LICENSE
  15. OWNERS
  16. PRESUBMIT.py
  17. README.md
  18. WATCHLISTS
README.md

build

Hi build contributor! If you do any change in scripts/master/ or touching any master's html/ directories, you must restart master.chromium.fyi first and ensure that it still works before restarting other masters.

Recipes

If you're here to make a change to ‘recipes’ (the code located in scripts/slave/recipes*), please take a look at the README for more information pertaining to recipes.