diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-10-27 17:02:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-10-27 17:04:08 +0200 |
| commit | 3dce9b5818576f04ce21cec4b3686eda012e5b65 (patch) | |
| tree | fe3d59c6da3e62c74563710ba63996585293c743 /chromium/build/android/gyp/dex.py | |
| parent | 5a424f4a7b188b75da63eb697f63558af0b17f6f (diff) | |
BASELINE: Update Chromium to 118.0.5993.24
Change-Id: I8373334b8ea8225ab4d934dc676aabc6a85a7efa
Diffstat (limited to 'chromium/build/android/gyp/dex.py')
| -rwxr-xr-x | chromium/build/android/gyp/dex.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/build/android/gyp/dex.py b/chromium/build/android/gyp/dex.py index ce91b38b1ae..221b3fd50c7 100755 --- a/chromium/build/android/gyp/dex.py +++ b/chromium/build/android/gyp/dex.py @@ -425,9 +425,10 @@ def main(args): options.class_inputs += options.class_inputs_filearg options.dex_inputs += options.dex_inputs_filearg - input_paths = options.class_inputs + options.dex_inputs - input_paths.append(options.r8_jar_path) - input_paths.append(options.custom_d8_jar_path) + input_paths = ([ + build_utils.JAVA_PATH_FOR_INPUTS, options.r8_jar_path, + options.custom_d8_jar_path + ] + options.class_inputs + options.dex_inputs) if options.main_dex_rules_path: input_paths.extend(options.main_dex_rules_path) |