Move pixel and common.nix out of flavors

SomeoneSerge · Apr 6, 2020 · 2966a63 · 2966a63
1 parent 3d611da
commit 2966a63
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 2 deletions.
diff --git a/default.nix b/default.nix
@@ -14,9 +14,7 @@ in
       };
     }
     configuration 
-    ./flavors/common.nix
     ./flavors/grapheneos
-    ./flavors/pixel
     ./flavors/vanilla
     ./modules/apps/auditor.nix
     ./modules/apps/chromium.nix
@@ -25,6 +23,7 @@ in
     ./modules/apps/seedvault.nix
     ./modules/apps/updater.nix
     ./modules/base.nix
+    ./modules/common.nix
     ./modules/emulator.nix
     ./modules/etc.nix
     ./modules/framework.nix
@@ -33,6 +32,7 @@ in
     ./modules/kernel.nix
     ./modules/keys.nix
     ./modules/microg.nix
+    ./modules/pixel
     ./modules/prebuilts.nix
     ./modules/release.nix
     ./modules/resources.nix

diff --git a/flavors/common.nix → modules/common.nix b/flavors/common.nix → modules/common.nix
diff --git a/flavors/partition-size-fix.patch → modules/partition-size-fix.patch b/flavors/partition-size-fix.patch → modules/partition-size-fix.patch
diff --git a/flavors/pixel/default.nix → modules/pixel/default.nix b/flavors/pixel/default.nix → modules/pixel/default.nix
diff --git a/flavors/pixel/pixel-imgs.json → modules/pixel/pixel-imgs.json b/flavors/pixel/pixel-imgs.json → modules/pixel/pixel-imgs.json
diff --git a/flavors/pixel/pixel-otas.json → modules/pixel/pixel-otas.json b/flavors/pixel/pixel-otas.json → modules/pixel/pixel-otas.json
diff --git a/flavors/pixel/update.sh → modules/pixel/update.sh b/flavors/pixel/update.sh → modules/pixel/update.sh
diff --git a/flavors/readonly-fix.patch → modules/readonly-fix.patch b/flavors/readonly-fix.patch → modules/readonly-fix.patch