add support for v4 APK signatures

compress-apks

@@ -54,5 +54,5 @@ maybe_zopfli() {
 
 export -f maybe_zopfli
 
-find "apps/packages" -regex '.+\.apk' |
+find "apps/packages" -regex '.+\.\(apk\|apk\.idsig\)' |
     parallel -q ::: maybe_brotli maybe_zopfli :::: -

generate.py

@@ -146,6 +146,8 @@ def remove_old_pkg_variants(orig_dict):
 
         assert pkg_props["channel"] in ["alpha", "beta", "stable", "old"]
 
+        has_v4_sigs = None
+
         for apk_name in sorted(filter(lambda n: n.endswith(".apk"), os.listdir(pkg_path))):
             apk_path = os.path.join(pkg_path, apk_name)
 
@@ -155,6 +157,16 @@ def remove_old_pkg_variants(orig_dict):
             assert os.path.getmtime(apk_path) == os.path.getmtime(apk_gz_path)
             assert os.path.getmtime(apk_path) == os.path.getmtime(apk_br_path)
 
+            if os.path.isfile(apk_path + ".idsig"):
+                if has_v4_sigs is False:
+                    # at least one previously encountered APK didn't have v4 sig
+                    raise Exception("one or more APK is missing a v4 signature: " + pkg_path)
+                has_v4_sigs = True
+            else:
+                if has_v4_sigs:
+                    raise Exception("v4 signature is missing for " + apk_path)
+                has_v4_sigs = False
+
             apk_hash_path = apk_path + ".sha256"
 
             if os.path.isfile(apk_hash_path):
@@ -198,6 +210,9 @@ def remove_old_pkg_variants(orig_dict):
                 if maybe_abi in abis_dict:
                     pkg_abis.add(abis_dict[maybe_abi])
 
+        if has_v4_sigs:
+            pkg_props["hasV4Signatures"] = True
+
         if len(pkg_abis) != 0:
             pkg_props["abis"] = list(pkg_abis)
 

import-apks.py

@@ -45,3 +45,10 @@
         shutil.copyfile(path, dest_path)
         print("copied to " + dest_path)
 
+    v4_sig_path = path + ".idsig"
+    if os.path.isfile(v4_sig_path):
+        if is_split:
+            shutil.copy(v4_sig_path, dest_dir)
+        else:
+            shutil.copyfile(v4_sig_path, dest_dir + "/base.apk.idsig")
+