Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vanilla: Update to 12.1 (March 2022) #176

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

vanilla: Update to 12.1 (March 2022) #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee9d305
pixel: update imgs/otas/drivers
zhaofengli Mar 23, 2022
6c82e0f
vanilla/12: Sync android-12.1.0_r1
zhaofengli Mar 23, 2022
e3c9101
vanilla/12: Sync android-12.1.0_r2
zhaofengli Mar 23, 2022
be24c3e
vanilla/raviole: update to SP2A.220305.013.A3
zhaofengli Mar 23, 2022
42c886d
vanilla: Update to SP2A.220305.012
zhaofengli Mar 24, 2022
a07d9dd
base: Update 12 to mean API level 32 (Android 12.1)
zhaofengli Mar 24, 2022
5d4ba3c
pixel/driver-binaries: Update --prebuilt-image patch for vanilla 12.1
zhaofengli Mar 23, 2022
55dba63
apv: Update apv pin for raviole devices
zhaofengli Mar 24, 2022
74b281d
vanilla/12: Drop unused manifests repo-android-12.0.0_r{28,32}
zhaofengli Mar 24, 2022
58a3cd7
vanilla: 2022022022 -> 2022032421
zhaofengli Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions flavors/vanilla/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ let
in
(mkIf (config.flavor == "vanilla" && config.androidVersion == 12) (mkMerge [
{
buildDateTime = mkDefault 1645396670;
buildDateTime = mkDefault 1648156966;

source.manifest.rev = mkDefault (
if (config.deviceFamily == "raviole") then "android-12.0.0_r32"
else "android-12.0.0_r28"
if (config.deviceFamily == "raviole") then "android-12.1.0_r2"
else "android-12.1.0_r1"
);
apv.buildID = mkDefault (
if (config.deviceFamily == "raviole") then "SQ1D.220205.004"
else "SQ1A.220205.002"
if (config.deviceFamily == "raviole") then "SP2A.220305.013.A3"
else "SP2A.220305.012"
);

# # Disable for now until we have it tested working
Expand Down Expand Up @@ -144,10 +144,10 @@ in
otaArgs = mkIf config.apv.enable [ "--skip_compatibility_check" ];

nixpkgs.overlays = let
owner = "danielfullmer";
owner = "zhaofengli";
repo = "android-prepare-vendor";
rev = "0067892ef57af7e0420bf7942e83d50f6d8f5baf";
sha256 = "03y3m2jjxlqmisxvd7cmjmqxgk9hnrs677ncgw47aarw5y4s3vrx";
rev = "21b3650fe627d95ccce3237b8154a841d16ac265";
sha256 = "1zyxc05lfiil1yzbivihfs9jafa3jkzyfha21bcgd07r482h2slf";
in [ (self: super: {
android-prepare-vendor = super.android-prepare-vendor.overrideAttrs (_: {
src = pkgs.fetchFromGitHub {
Expand Down
Loading