grapheneos: remove Android 11 release

Author: danielfullmer

flavors/grapheneos/default.nix

@@ -7,10 +7,7 @@ let
     optional optionalString optionalAttrs elem
     mkIf mkMerge mkDefault mkForce;
 
-  upstreamParams =
-    if config.androidVersion == 11
-    then import ./upstream-params-11.nix
-    else import ./upstream-params.nix;
+  upstreamParams = import ./upstream-params.nix;
   grapheneOSRelease = "${config.apv.buildID}.${upstreamParams.buildNumber}";
 
   phoneDeviceFamilies = [ "crosshatch" "bonito" "coral" "sunfish" "redfin" "barbet" ];
@@ -32,11 +29,7 @@ in mkIf (config.flavor == "grapheneos") (mkMerge [
   source.dirs = lib.importJSON (./. + "/repo-${grapheneOSRelease}.json");
 
   apv.enable = mkIf (elem config.deviceFamily phoneDeviceFamilies) (mkDefault true);
-  apv.buildID = mkMerge [
-    (mkIf (config.androidVersion == 11 && config.device != "barbet") (mkDefault "RQ3A.211001.001"))
-    (mkIf (config.androidVersion == 11 && config.device == "barbet") (mkDefault "RD2A.211001.002"))
-    (mkIf (config.androidVersion == 12) (mkDefault "SP1A.210812.015"))
-  ];
+  apv.buildID = mkDefault "SP1A.210812.015";
 
 
   # Not strictly necessary for me to set these, since I override the source.dirs above

flavors/grapheneos/kernel.nix

@@ -4,22 +4,12 @@ let
   inherit (lib)
     mkIf mkMerge mkDefault;
 
-  # TODO: Temporary workaround for GrapheneOS 2021100606
-  android12SourceDirs = (import ../../default.nix {
-    inherit pkgs;
-    configuration = {
-      source.dirs = lib.importJSON ./repo-SP1A.210812.015.2021102300.json;
-    };
-  }).config.source.dirs;
-
   clangVersion = "r416183b";
   postRedfin = lib.elem config.deviceFamily [ "redfin" "barbet" ];
 
   dependencies = let
     fixupRepo = repoName: { buildInputs ? [], ... }@args: pkgs.stdenv.mkDerivation ({
       name = lib.strings.sanitizeDerivationName repoName;
-      # TODO: Temporary workaround for GrapheneOS 2021100606
-      #src = android12SourceDirs.${repoName}.src;
       src = config.source.dirs.${repoName}.src;
       buildInputs = with pkgs; buildInputs ++ [ autoPatchelfHook ];
       installPhase = ''
@@ -33,9 +23,7 @@ let
     "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" = { buildInputs = with pkgs; [ python ]; };
     "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" = { buildInputs = with pkgs; [ python ]; };
     "prebuilts/clang/host/linux-x86/clang-${clangVersion}"= {
-      # TODO: Temporary workaround for GrapheneOS 2021100606
-      src = android12SourceDirs."prebuilts/clang/host/linux-x86".src + "/clang-${clangVersion}";
-      # src = config.source.dirs."prebuilts/clang/host/linux-x86".src + "/clang-${clangVersion}";
+      src = config.source.dirs."prebuilts/clang/host/linux-x86".src + "/clang-${clangVersion}";
       buildInputs = with pkgs; [
         zlib ncurses5 libedit
         stdenv.cc.cc.lib # For libstdc++.so.6
@@ -47,21 +35,16 @@ let
     };
     "prebuilts/gas/linux-x86" = {};
     "prebuilts/misc/linux-x86" = {
-      # TODO: Temporary workaround for GrapheneOS 2021100606
-      src = android12SourceDirs."prebuilts/misc".src + "/linux-x86";
-      #src = config.source.dirs."prebuilts/misc".src + "/linux-x86";
+      src = config.source.dirs."prebuilts/misc".src + "/linux-x86";
       buildInputs = with pkgs; [ python ];
     };
     "kernel/prebuilts/build-tools" = {
-      # TODO: Temporary workaround for GrapheneOS 2021100606
       src = config.source.dirs."kernel/prebuilts/build-tools".src;
       buildInputs = with pkgs; [ python ];
       postInstall = ''
         # Workaround for patchelf not working with embedded python interpreter
-        # TODO: Temporary workaround for GrapheneOS 2021100606
-        cp ${android12SourceDirs."system/libufdt".src}/utils/src/mkdtboimg.py $out/linux-x86/bin
+        cp ${config.source.dirs."system/libufdt".src}/utils/src/mkdtboimg.py $out/linux-x86/bin
       '';
-        # cp ${config.source.dirs."system/libufdt".src}/utils/src/mkdtboimg.py $out/linux-x86/bin
     };
   });