summaryrefslogtreecommitdiffstats
path: root/chromium/build/android/gyp/dex.py
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-04 17:20:24 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-12 08:15:25 +0000
commit8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch)
tree788d8d7549712682703a0310ca4a0f0860d4802b /chromium/build/android/gyp/dex.py
parent606d85f2a5386472314d39923da28c70c60dc8e7 (diff)
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/android/gyp/dex.py')
-rwxr-xr-xchromium/build/android/gyp/dex.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/build/android/gyp/dex.py b/chromium/build/android/gyp/dex.py
index f64ddceb359..c8495191ad8 100755
--- a/chromium/build/android/gyp/dex.py
+++ b/chromium/build/android/gyp/dex.py
@@ -327,7 +327,7 @@ def _ZipMultidex(file_dir, dex_files):
ordered_files.append(('classes.dex', f))
break
if not ordered_files:
- raise Exception('Could not find classes.dex multidex file in %s',
+ raise Exception('Could not find classes.dex multidex file in %s' %
dex_files)
for dex_idx in range(2, len(dex_files) + 1):
archive_name = 'classes%d.dex' % dex_idx
@@ -336,10 +336,10 @@ def _ZipMultidex(file_dir, dex_files):
ordered_files.append((archive_name, f))
break
else:
- raise Exception('Could not find classes%d.dex multidex file in %s',
+ raise Exception('Could not find classes%d.dex multidex file in %s' %
dex_files)
if len(set(f[1] for f in ordered_files)) != len(ordered_files):
- raise Exception('Unexpected clashing filenames for multidex in %s',
+ raise Exception('Unexpected clashing filenames for multidex in %s' %
dex_files)
zip_name = os.path.join(file_dir, 'multidex_classes.zip')