diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 16:35:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 15:45:54 +0000 |
| commit | 32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch) | |
| tree | eeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/build/android/gyp/dex.py | |
| parent | 99677208ff3b216fdfec551fbe548da5520cd6fb (diff) | |
BASELINE: Update Chromium to 87.0.4280.67
Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/android/gyp/dex.py')
| -rwxr-xr-x | chromium/build/android/gyp/dex.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chromium/build/android/gyp/dex.py b/chromium/build/android/gyp/dex.py index fa5f0cc4f3f..905c44d9d21 100755 --- a/chromium/build/android/gyp/dex.py +++ b/chromium/build/android/gyp/dex.py @@ -472,9 +472,7 @@ def _OnStaleMd5(changes, options, final_dex_inputs, dex_cmd): def MergeDexForIncrementalInstall(r8_jar_path, src_paths, dest_dex_jar): - dex_cmd = [ - build_utils.JAVA_PATH, - '-Xmx1G', + dex_cmd = build_utils.JavaCmd(verify=False) + [ '-cp', r8_jar_path, 'com.android.tools.r8.D8', @@ -509,9 +507,7 @@ def main(args): track_subpaths_allowlist = None final_dex_inputs += options.dex_inputs - dex_cmd = [ - build_utils.JAVA_PATH, - '-Xmx1G', + dex_cmd = build_utils.JavaCmd(options.warnings_as_errors) + [ '-cp', options.r8_jar_path, 'com.android.tools.r8.D8', |