Add missing min_sdk_version to apk_merger.py

finalize_apk.py changed in 7d191755

Bug: 1040240
Change-Id: I70b73881098aa7b1b5f0375052d62cb7b0d61624
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992249
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729822}

android_webview/tools/apk_merger.py

@@ -254,11 +254,13 @@ def main():
 
     apksigner_jar = os.path.join(
         os.path.dirname(args.zipalign_path), 'lib', 'apksigner.jar')
-    # TODO(https://crbug.com/1040240): remove the pylint suppression and pass
-    # the right value
-    finalize_apk.FinalizeApk(  # pylint: disable=no-value-for-parameter
-        apksigner_jar, args.zipalign_path, tmp_apk, new_apk, args.keystore_path,
-        args.key_password, args.key_name)
+    # Official APKs are re-signed anyways, so it is not important to figure out
+    # the correct min_sdk_version. Use 21 since that's the lowest supported
+    # webview version.
+    min_sdk_version = 21
+    finalize_apk.FinalizeApk(apksigner_jar, args.zipalign_path, tmp_apk,
+                             new_apk, args.keystore_path, args.key_password,
+                             args.key_name, min_sdk_version)
   finally:
     shutil.rmtree(tmp_dir)
   return 0