Option to disable v4 signing

Summary: As title.

Reviewed By: ssj933

Differential Revision: D53126910

fbshipit-source-id: dc7834fc9178b575c04362e2d8c72c1b28c8e294

pyredex/utils.py

@@ -353,7 +353,12 @@ def remove_signature_files(extracted_apk_dir: str) -> None:
 
 
 def sign_apk(
-    keystore: str, keypass: str, keyalias: str, apk: str, ignore_apksigner: bool = False
+    sign_v4: typing.Optional[bool],
+    keystore: str,
+    keypass: str,
+    keyalias: str,
+    apk: str,
+    ignore_apksigner: bool = False,
 ) -> None:
     def run() -> None:
         subprocess.check_call(
@@ -362,6 +367,13 @@ def run() -> None:
                 "sign",
                 "--v1-signing-enabled",
                 "--v2-signing-enabled",
+            ]
+            + (
+                []
+                if sign_v4 is None
+                else (["--v4-signing-enabled", "true" if sign_v4 else "false"])
+            )
+            + [
                 "--ks",
                 keystore,
                 "--ks-pass",
@@ -406,6 +418,7 @@ def argparse_yes_no_flag(
     flag_name: str,
     on_prefix: str = "",
     off_prefix: str = "no-",
+    default: typing.Optional[bool] = False,
     **kwargs: typing.Any,
 ) -> None:
     class FlagAction(argparse.Action):
@@ -424,7 +437,7 @@ def __call__(self, parser, namespace, values, option_string=None):
         f"--{off_prefix}{flag_name}",
         dest=flag_name.replace("-", "_"),
         action=FlagAction,
-        default=False,
+        default=default,
         **kwargs,
     )
 

redex.py

@@ -455,6 +455,7 @@ def align_and_sign_output_apk(
     output_apk_path: str,
     reset_timestamps: bool,
     sign: bool,
+    sign_v4: typing.Optional[bool],
     keystore: str,
     key_alias: str,
     key_password: str,
@@ -478,7 +479,14 @@ def align_and_sign_output_apk(
 
     # Add new signature
     if sign:
-        sign_apk(keystore, key_password, key_alias, output_apk_path, ignore_apksigner)
+        sign_apk(
+            sign_v4,
+            keystore,
+            key_password,
+            key_alias,
+            output_apk_path,
+            ignore_apksigner,
+        )
 
 
 def copy_file_to_out_dir(
@@ -570,6 +578,9 @@ def arg_parser(
     parser.add_argument("-c", "--config", default=config, help="Configuration file")
 
     argparse_yes_no_flag(parser, "sign", help="Sign the apk after optimizing it")
+    argparse_yes_no_flag(
+        parser, "sign-v4", default=None, help="Sign the apk with v4 signing"
+    )
     parser.add_argument("-s", "--keystore", nargs="?", default=keystore)
     parser.add_argument("-a", "--keyalias", nargs="?", default=keyalias)
     parser.add_argument("-p", "--keypass", nargs="?", default=keypass)
@@ -1355,6 +1366,7 @@ def finalize_redex(state: State) -> None:
                 # In dev mode, reset timestamps.
                 state.args.reset_zip_timestamps or state.args.dev,
                 state.args.sign,
+                state.args.sign_v4,
                 state.args.keystore,
                 state.args.keyalias,
                 state.args.keypass,

test/debug_info/add_assets.py

@@ -25,4 +25,4 @@
         zf.write(asset, os.path.join("assets", os.path.basename(asset)))
 
 add_tool_override("apksigner", args.apksigner_path)
-sign_apk(args.keystore, args.keypass, args.keyalias, args.apk)
+sign_apk(False, args.keystore, args.keypass, args.keyalias, args.apk)

test/equivalence/generate_tests.py

@@ -40,4 +40,4 @@
     os.rename(f"{args.output}.zip", args.output)
 
     add_tool_override("apksigner", args.apksigner_path)
-    sign_apk(args.keystore, args.keypass, args.keyalias, args.output)
+    sign_apk(False, args.keystore, args.keypass, args.keyalias, args.output)