waydroid: Update for the latest version

Patching script now uses git command for applying binary patches.
(patch command does not currently support binary patches, unfortunately)

Author: vroad

flake.nix

@@ -35,6 +35,7 @@
         gitRepo nix-prefetch-git
         curl go-pup jq
         shellcheck
+        wget
 
         # For chromium updater script
         python2 cipd git

flavors/waydroid/anbox.xml

@@ -9,20 +9,22 @@ let
     mkMerge
     mkBefore
   ;
-  repoDirs = lib.importJSON (./. + "/repo-lineage-17.1.json");
+  repoDirs = lib.importJSON ./repo-lineage-17.1.json;
   patchMetadata = lib.importJSON ./patch-metadata.json;
+  repoDateTimes = lib.mapAttrsToList (name: value: value.dateTime) repoDirs;
+  maxRepoDateTime = lib.foldl (a: b: lib.max a b) 0 repoDateTimes;
 in mkIf (config.flavor == "waydroid")
 {
-  buildDateTime = mkDefault 1629060864;
+  buildDateTime = mkDefault maxRepoDateTime;
 
   androidVersion = mkDefault 10;
-  productNamePrefix = "lineage_anbox_";
+  productNamePrefix = "lineage_waydroid_";
   variant = mkDefault "userdebug";
 
   source.dirs = mkMerge [
     repoDirs
     (lib.mapAttrs (relpath: patches: {
-      patches = (builtins.map (p: "${config.source.dirs."anbox-patches".src}/${relpath}/${p}") patches);
+      patches = (builtins.map (p: "${config.source.dirs."vendor/extra".src}/${patches.dir}/${p}") patches.files);
     }) patchMetadata)
   ];
 
@@ -50,8 +52,11 @@ in mkIf (config.flavor == "waydroid")
           $ANDROID_PRODUCT_OUT/build_fingerprint.txt \
           $ANDROID_PRODUCT_OUT/installed-files.txt
 
-        cp --reflink=auto -r $ANDROID_PRODUCT_OUT/system.img $out
-        cp --reflink=auto -r $ANDROID_PRODUCT_OUT/vendor.img $out
+        for v in system.img vendor.img; do
+          ${pkgs.simg2img}/bin/simg2img $ANDROID_PRODUCT_OUT/$v $out/$v
+          ${pkgs.e2fsprogs}/bin/e2fsck -fy $out/$v
+          ${pkgs.e2fsprogs}/bin/resize2fs -M $out/$v
+        done
       '';
     };
   };

flavors/waydroid/default.nix

@@ -8,16 +8,20 @@
 
 def main() -> None:
     data = json.load(open('repo-lineage-17.1.json'))
-    anbox_patches = data['anbox-patches']
-    git_info = checkout_git(anbox_patches['url'], anbox_patches['rev'])
+    waydroid_vendor = data['vendor/extra']
+    git_info = checkout_git(waydroid_vendor['url'], waydroid_vendor['rev'])
     topdir = git_info['path']
 
     output = {}
-    for dirpath, dirs, files in os.walk(topdir):
+    patches_dir = os.path.join(topdir, 'waydroid-patches', 'base-patches')
+    for dirpath, dirs, files in os.walk(patches_dir):
         if any(f.endswith('.patch') for f in files):
-            if dirpath.startswith(topdir):
-                dirpath = dirpath[len(topdir)+1:]
-            output[dirpath] = sorted(files)
+            src_path = dirpath[len(topdir)+1:]
+            dest_path = dirpath[len(patches_dir)+1:]
+            output[dest_path] = {
+                'dir': src_path,
+                'files': sorted(files),
+            }
 
     save('patch-metadata.json', output)