From 1ddee6f1a0602cb1149ee97cfcc377ddaca44195 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 5 Oct 2023 04:54:06 +0530 Subject: [PATCH 001/111] git-review: 14 Change-Id: I5f319582e9c3176b7c8e27a2f4fb71268f80602c --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index acd43a23..63e89326 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.calyxos.org port=29418 project=CalyxOS/scripts -defaultbranch=android13 +defaultbranch=android14 From e2562b060c169cd11bf1398c94a5f6e0167aca0a Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 5 Oct 2023 05:05:03 +0530 Subject: [PATCH 002/111] vars/common: 14 Change-Id: I25844ddeabe2b28f6a95a21175047d4745b665d3 --- vars/common | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/vars/common b/vars/common index b89f243b..afacfcec 100644 --- a/vars/common +++ b/vars/common @@ -1,20 +1,20 @@ # Entire file updated manually -readonly android_version=13 # For build-desc-fingerprint.sh -readonly aosp_tag_match=android-13.0 # For update-device-vars.sh +readonly android_version=14 # For build-desc-fingerprint.sh +readonly aosp_tag_match=android-14.0 # For update-device-vars.sh -readonly os_branch=android13 -readonly device_branch=android13 +readonly os_branch=android14 +readonly device_branch=android14 -readonly common_aosp_branch=android13-security-release # Oct 2023 +readonly common_aosp_branch=android14-release # Oct 2023 -readonly prev_common_aosp_tag=android-security-13.0.0_r9 # Sep 2023 -readonly common_aosp_tag=android-security-13.0.0_r10 # Oct 2023 +readonly prev_common_aosp_tag=NA # NA +readonly common_aosp_tag=android-14.0.0_r1 # Oct 2023 -readonly common_aosp_build_id=TQ3A.230905.001 # Sep 2023, Pixel 4a (5G) - 7a +readonly common_aosp_build_id=UP1A.231005.007 # Oct 2023, Pixel 4a (5G) - 7a -readonly topic=oct23 +readonly topic=fourteen -readonly lineageos_branch=lineage-20.0 -readonly lineageos_device_branch=lineage-20 +readonly lineageos_branch=lineage-21.0 +readonly lineageos_device_branch=lineage-21 readonly merge_method="merge" From bf707e2afa7c64a87974c72cd20a992ac718ef73 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 5 Oct 2023 05:05:58 +0530 Subject: [PATCH 003/111] vars/${pixels[@]}: 14 Change-Id: I282583589b548c53dabe6192fc0a576f02b81512 --- vars/barbet | 22 +++++++++++----------- vars/bluejay | 22 +++++++++++----------- vars/bramble | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/felix | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/redfin | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- 11 files changed, 121 insertions(+), 121 deletions(-) diff --git a/vars/barbet b/vars/barbet index a5b5f020..d662d5ce 100644 --- a/vars/barbet +++ b/vars/barbet @@ -25,23 +25,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-tq3a.230901.001-factory-533f6127.zip" -readonly image_sha256="533f6127fd5cafb1667b3e177d9e9a4d70035f427861010f5c06befaaa5dfd9b" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-up1a.231005.007-factory-b7a4ba5f.zip" +readonly image_sha256="b7a4ba5f8bc1728d64a7ee800226ffa6a07799e9da2d34940e3974758ee7ed39" -readonly flash_url="https://flash.android.com/build/10750268?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-tq3a.230901.001-3dd5e91e.zip" -readonly ota_sha256="3dd5e91e3a3fe612e9d1d6b4d787113053c31d740a9f227b7243b3befeaa5263" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-up1a.231005.007-5932cd00.zip" +readonly ota_sha256="5932cd006310f8d0ccab15db866115cb2ab7d0c5667d4847e411d3769e5c60b5" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/bluejay b/vars/bluejay index c964dd1f..b61594e7 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-tq3a.230901.001-factory-141a3d5b.zip" -readonly image_sha256="141a3d5b9dcffb59df5f6171f1c0f020e5832e0f68c8d6b691566403b03b7a5f" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-up1a.231005.007-factory-ab16eb7b.zip" +readonly image_sha256="ab16eb7b02a22030b4b5c2b7e768783ea15bdc0268874f543edbe25bb1409ce4" -readonly flash_url="https://flash.android.com/build/10750268?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-tq3a.230901.001-1f1f0abe.zip" -readonly ota_sha256="1f1f0abe67a6f6f47287be6dafec2c12628de6a715b82ca7beddaf67ad22aca5" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-up1a.231005.007-b0c46acf.zip" +readonly ota_sha256="b0c46acfbd5aaaf93cba51944be86cce17ee30323c38af3c9a3bbfffbe535cb6" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/bramble b/vars/bramble index 1b29e8da..a199c391 100644 --- a/vars/bramble +++ b/vars/bramble @@ -25,23 +25,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/bramble-tq3a.230901.001-factory-ae237efd.zip" -readonly image_sha256="ae237efd5531feedc43038ec8326f2f7f418541deab1363b500d23b3b355ee10" +readonly image_url="https://dl.google.com/dl/android/aosp/bramble-up1a.231005.007-factory-fc548663.zip" +readonly image_sha256="fc54866335ba7efdcca38e61fcd939025f5140df2490a61c8a824f03267850b2" -readonly flash_url="https://flash.android.com/build/10750268?target=bramble-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=bramble-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-tq3a.230901.001-6d107ffa.zip" -readonly ota_sha256="6d107ffac1cd3da2c972112acc75957ed725e5c13d57ca724d9bcca5404fcebd" +readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-up1a.231005.007-231386fe.zip" +readonly ota_sha256="231386fedfa64b0456bf0287b485d89bb3cc96955075737d36a64a5d8fc9e5f3" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/cheetah b/vars/cheetah index fd6521f1..eabc7bb8 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -25,23 +25,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-tq3a.230901.001-factory-6b946f4d.zip" -readonly image_sha256="6b946f4db4b28d04ff436924f9e9dbf18f989df22c2298bbf7889f1a7db9d515" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-up1a.231005.007-factory-b556b487.zip" +readonly image_sha256="b556b4871aa41cd42783f7c8ac9d628e0241233deea89e319de522dc482c7b8b" -readonly flash_url="https://flash.android.com/build/10750268?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-tq3a.230901.001-6b881553.zip" -readonly ota_sha256="6b881553f012d582080642d660e1cf5c9e6fe41e9f1c6ab12ae87fab7894e307" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-up1a.231005.007-7b69c467.zip" +readonly ota_sha256="7b69c467532aa84f6d8353cb8671f370d5bce3008879c222b39240f2940f00c5" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/felix b/vars/felix index 5fb8de27..b4395e8c 100644 --- a/vars/felix +++ b/vars/felix @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3C.230901.001.A1" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-c-s10-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r72" -readonly aosp_tag="android-13.0.0_r80" +readonly prev_aosp_tag="android-13.0.0_r80" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750808" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-tq3c.230901.001.a1-factory-334244a0.zip" -readonly image_sha256="334244a068ae61f6f609c16171fdd06c17675f3ae1d7a802241892ec3a988df4" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-up1a.231005.007-factory-9262aa73.zip" +readonly image_sha256="9262aa73d50ccc6c76e2910b9af20fbd1eaf7468f8008e8442c26751687ec397" -readonly flash_url="https://flash.android.com/build/10750808?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-tq3c.230901.001.a1-2fd0f36e.zip" -readonly ota_sha256="2fd0f36e0ac316ca5678043cd2a597e09ca6ac0557d9d8e4499f17ce24cb032c" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-up1a.231005.007-bd90d74b.zip" +readonly ota_sha256="bd90d74bb173b47b8e14af98d6395007ddb23f89b33dc71bb44358f35fb21218" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/lynx b/vars/lynx index 79eb3cc1..1383ca32 100644 --- a/vars/lynx +++ b/vars/lynx @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-tq3a.230901.001-factory-c54b4a33.zip" -readonly image_sha256="c54b4a33f42db91904a0b1ffb6c272207437b14e2331fc093b9f111e3b6d4ee4" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-up1a.231005.007-factory-aea9c006.zip" +readonly image_sha256="aea9c006e58d9c8b07ba7262c80a2fdde073c20811a82824abfd8e58c2575ce1" -readonly flash_url="https://flash.android.com/build/10750268?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-tq3a.230901.001-79bacf86.zip" -readonly ota_sha256="79bacf863b8de86041086834b94e428a73337922cd73bde116f25c5deb57db3f" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-up1a.231005.007-e2085c49.zip" +readonly ota_sha256="e2085c49ca7f3b3dd9dc6dfacae5ceb87ec11969e25f929893a08e5e2cf9436a" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/oriole b/vars/oriole index acf5156a..ab8c5ab8 100644 --- a/vars/oriole +++ b/vars/oriole @@ -22,23 +22,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-tq3a.230901.001-factory-57afd319.zip" -readonly image_sha256="57afd319cb7660c477c0063b3ae6b5e6159fa9f38597d9d21595a7f3a863b2cd" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-up1a.231005.007-factory-6db3bfe6.zip" +readonly image_sha256="6db3bfe63d5dad33aad03df2b9d828448eeaf523659d0b16697d251f618b535a" -readonly flash_url="https://flash.android.com/build/10750268?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-tq3a.230901.001-ea9d9bca.zip" -readonly ota_sha256="ea9d9bca6dfc031e2e7969b6e143005cd87531a95cf2b736cd57c1e37ec430e8" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-up1a.231005.007-b69a2c1b.zip" +readonly ota_sha256="b69a2c1bf439a6b292a9e2db401ad0e89497d147142255b2daf53f83be79ff34" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/panther b/vars/panther index 3a8fd6e6..a31b9064 100644 --- a/vars/panther +++ b/vars/panther @@ -22,23 +22,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-tq3a.230901.001-factory-21bf556f.zip" -readonly image_sha256="21bf556f0d65fc1e383a5d0614084c9dce685219537e6909d0bbcffe0ef331ea" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-up1a.231005.007-factory-09c6d453.zip" +readonly image_sha256="09c6d453f6a1d2c58a791bb113a489b38d4d38d58f138fecc432280097c25931" -readonly flash_url="https://flash.android.com/build/10750268?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-tq3a.230901.001-a8420d46.zip" -readonly ota_sha256="a8420d46318e07094574d13415bf30be90c84f4be148582bc62c26e230102e87" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-up1a.231005.007-16d1f4a7.zip" +readonly ota_sha256="16d1f4a73bae65cd4e95b41c81ccf0e576c8d87f9c7787c0aaf10c6fff43797c" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/raven b/vars/raven index 665096dc..a05a454a 100644 --- a/vars/raven +++ b/vars/raven @@ -24,23 +24,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-tq3a.230901.001-factory-5917d34f.zip" -readonly image_sha256="5917d34f251c8094b0db034127220a9244acf13559f16e929f83288de4545453" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-up1a.231005.007-factory-7894f2e7.zip" +readonly image_sha256="7894f2e79933f4cf32e26146175e5326e684d3b5801955adfdfb1dd227f6230d" -readonly flash_url="https://flash.android.com/build/10750268?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-tq3a.230901.001-16187f60.zip" -readonly ota_sha256="16187f604421f90baeb73ddeb04c12328ffe8dd664fd25cb39b8324d25f4a0a5" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-up1a.231005.007-59a0a7fc.zip" +readonly ota_sha256="59a0a7fc025750d9496fc047320d9cb9f5e3c77a8c559f3e36de61a093075c30" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/redfin b/vars/redfin index 47d234c7..e6a46788 100644 --- a/vars/redfin +++ b/vars/redfin @@ -26,23 +26,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r75" +readonly prev_aosp_tag="android-13.0.0_r75" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750268" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/redfin-tq3a.230901.001-factory-308061bf.zip" -readonly image_sha256="308061bf6961ade40cae773395e01e5ca05fc8ebb554d4c56c42057b1022ec2e" +readonly image_url="https://dl.google.com/dl/android/aosp/redfin-up1a.231005.007-factory-c0da18e6.zip" +readonly image_sha256="c0da18e6c2b7de06bc732c1fdad2d3e4d2402f6330f67d961fbd862347ca4e8d" -readonly flash_url="https://flash.android.com/build/10750268?target=redfin-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=redfin-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-tq3a.230901.001-eac0a8f6.zip" -readonly ota_sha256="eac0a8f686a2d16b5ee2944d22cda9dec7ca044f521b7b240f6a312daa3b5115" +readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-up1a.231005.007-4593d7c6.zip" +readonly ota_sha256="4593d7c611b0712b0b508f41363bcc44d0247ce7396d79afc9fb395185e6a960" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" diff --git a/vars/tangorpro b/vars/tangorpro index f7154a87..1ede5dbc 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -23,23 +23,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230901.001.B1" +readonly build_id="UP1A.231005.007" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-s10-release" +readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r71" -readonly aosp_tag="android-13.0.0_r76" +readonly prev_aosp_tag="android-13.0.0_r76" +readonly aosp_tag="android-14.0.0_r1" -readonly build_number="10750577" +readonly build_number="10754064" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-tq3a.230901.001.b1-factory-5ca0683c.zip" -readonly image_sha256="5ca0683c5fdc33a4bb77e6648d76382bdc9a0bf37f15af5ae4dcb302b6530837" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-up1a.231005.007-factory-1b708c9a.zip" +readonly image_sha256="1b708c9ae9e2f1ffebc35f4fff7a2dd0ef225b13e7e9b8641fa018992e00eec5" -readonly flash_url="https://flash.android.com/build/10750577?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/10754064?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-tq3a.230901.001.b1-d0d5de51.zip" -readonly ota_sha256="d0d5de519ec5d4a45e81e85c62c5072a91b2623a0918aa95c3b92a79d7b1c130" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-up1a.231005.007-176bbf3c.zip" +readonly ota_sha256="176bbf3cd07aa7f2d2c9bcc45e23a98ee18443b523e4ed523b31deb4b93bf478" -readonly security_patch="2023-09-01" +readonly security_patch="2023-10-05" From 2706244a70bfc9324de948230cdb5aef59342f0f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 6 Nov 2023 23:23:29 +0200 Subject: [PATCH 004/111] aosp-merger: Make script output a bit more readable Change-Id: Ia624f82dd19b7d6e7902eaec3584748db72a90b5 (cherry picked from commit 259965cf96c37cb8b10b1279c711e9d02a86275b) --- aosp-merger/_merge_helper.sh | 6 +++--- aosp-merger/_subtree_merge_helper.sh | 4 ++-- aosp-merger/merge-aosp-forks.sh | 6 +++--- aosp-merger/merge-aosp.sh | 6 +++--- aosp-merger/push-merge.sh | 10 +++++----- aosp-merger/push-upstream.sh | 6 +++--- aosp-merger/squash.sh | 8 ++++---- aosp-merger/upload-merge.sh | 8 ++++---- aosp-merger/upload-squash.sh | 8 ++++---- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index 01f81629..71ae9548 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -105,7 +105,7 @@ if [ ! -z "${OLDTAG}" ]; then fi if [[ "${OPERATION}" == "merge" ]]; then - echo "#### Merging ${NEWTAG} into ${PROJECTPATH} ####" + echo -e "\n#### Merging ${NEWTAG} into ${PROJECTPATH} ####" if [ -f ".gitupstream-lineage" ]; then git merge --no-commit --log lineage/"${LINEAGEBRANCH}" && git commit --no-edit else @@ -120,7 +120,7 @@ if [[ "${OPERATION}" == "merge" ]]; then exit 0 fi elif [[ "${OPERATION}" == "rebase" ]]; then - echo "#### Rebasing ${PROJECTPATH} onto ${NEWTAG} ####" + echo -e "\n#### Rebasing ${PROJECTPATH} onto ${NEWTAG} ####" git rebase --onto "${NEWTAG}" "${OLDTAG}" fi diff --git a/aosp-merger/_subtree_merge_helper.sh b/aosp-merger/_subtree_merge_helper.sh index 81b4f623..67532b95 100755 --- a/aosp-merger/_subtree_merge_helper.sh +++ b/aosp-merger/_subtree_merge_helper.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -98,7 +98,7 @@ fi CONFLICT="" -echo "#### Merging ${NEWTAG} into ${PROJECTPATH} ####" +echo -e "\n#### Merging ${NEWTAG} into ${PROJECTPATH} ####" git merge --no-commit --log "${NEWTAG}" if [[ -z "$(git diff --no-ext-diff HEAD)" ]]; then diff --git a/aosp-merger/merge-aosp-forks.sh b/aosp-merger/merge-aosp-forks.sh index ea0c5782..fac48ebe 100755 --- a/aosp-merger/merge-aosp-forks.sh +++ b/aosp-merger/merge-aosp-forks.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -59,10 +59,10 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" # Build list of forked repos PROJECTPATHS=$(grep "name=\"CalyxOS/" "${MANIFEST}" | sed -n 's/.*path="\([^"]\+\)".*/\1/p') -echo "#### Old tag = ${OLDTAG} Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####" +echo -e "\n#### Old tag = ${OLDTAG} Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####" # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on forked AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then diff --git a/aosp-merger/merge-aosp.sh b/aosp-merger/merge-aosp.sh index 2f513b76..7114394c 100755 --- a/aosp-merger/merge-aosp.sh +++ b/aosp-merger/merge-aosp.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -59,10 +59,10 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" # Build list of AOSP repos PROJECTPATHS=$(grep -v "remote=\"gitlab" "${MANIFEST}" | grep -v "clone-depth=\"1" | sed -n 's/.*path="\([^"]\+\)".*/\1/p') -echo "#### Old tag = ${OLDTAG} New tag = ${NEWTAG} Staging branch = ${STAGINGBRANCH} ####" +echo -e "\n#### Old tag = ${OLDTAG} New tag = ${NEWTAG} Staging branch = ${STAGINGBRANCH} ####" # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then diff --git a/aosp-merger/push-merge.sh b/aosp-merger/push-merge.sh index eb7f3d9d..c65a24eb 100755 --- a/aosp-merger/push-merge.sh +++ b/aosp-merger/push-merge.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -53,10 +53,10 @@ source "${TOP}/build/envsetup.sh" # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') -echo "#### Staging branch = ${STAGINGBRANCH} ####" +echo -e "\n#### Staging branch = ${STAGINGBRANCH} ####" # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on forked AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then @@ -66,7 +66,7 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do done echo "#### Verification complete - no uncommitted changes found ####" -echo "#### $(basename ${MERGEDREPOS}) ####" +echo -e "\n#### $(basename ${MERGEDREPOS}) ####" read -p "Pushing ${STAGINGBRANCH}. Press enter to confirm." # Iterate over each forked project @@ -82,7 +82,7 @@ for PROJECTPATH in ${PROJECTPATHS}; do fi fi - echo "#### Submitting ${PROJECTPATH} merge ####" + echo -e "\n#### Submitting ${PROJECTPATH} merge ####" git checkout "${STAGINGBRANCH}" calyxremote | grep -v "Remote 'calyx' created" git push calyx HEAD:refs/heads/"${BRANCH}" diff --git a/aosp-merger/push-upstream.sh b/aosp-merger/push-upstream.sh index a8ac09a8..3e57eeb9 100755 --- a/aosp-merger/push-upstream.sh +++ b/aosp-merger/push-upstream.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -54,7 +54,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') read -p "Press enter to begin pushing upstream branch." # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on forked AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then @@ -74,7 +74,7 @@ for PROJECTPATH in ${PROJECTPATHS}; do UPSTREAMBRANCH="${lineageos_branch}" fi fi - echo "#### Pushing upstream branch ${UPSTREAMBRANCH} for ${PROJECTPATH} ####" + echo -e "\n#### Pushing upstream branch ${UPSTREAMBRANCH} for ${PROJECTPATH} ####" calyxremote | grep -v "Remote 'calyx' created" if [ "${LINEAGE}" = true ]; then git push calyx lineage/${UPSTREAMBRANCH}:refs/heads/upstream/${UPSTREAMBRANCH} diff --git a/aosp-merger/squash.sh b/aosp-merger/squash.sh index c4e2d572..26e38af8 100755 --- a/aosp-merger/squash.sh +++ b/aosp-merger/squash.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -54,10 +54,10 @@ fi # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') -echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####" +echo -e "\n#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####" # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on forked AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then @@ -70,7 +70,7 @@ echo "#### Verification complete - no uncommitted changes found ####" # Iterate over each forked project for PROJECTPATH in ${PROJECTPATHS}; do cd "${TOP}/${PROJECTPATH}" - echo "#### Squashing ${PROJECTPATH} ####" + echo -e "\n#### Squashing ${PROJECTPATH} ####" repo abandon "${SQUASHBRANCH}" . git checkout -b "${SQUASHBRANCH}" "${STAGINGBRANCH}" git branch --set-upstream-to=m/"${BRANCH}" diff --git a/aosp-merger/upload-merge.sh b/aosp-merger/upload-merge.sh index 25f3809b..065a910a 100755 --- a/aosp-merger/upload-merge.sh +++ b/aosp-merger/upload-merge.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -51,10 +51,10 @@ fi # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') -echo "#### Staging branch = ${STAGINGBRANCH} ####" +echo -e "\n#### Staging branch = ${STAGINGBRANCH} ####" # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on forked AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then @@ -67,6 +67,6 @@ echo "#### Verification complete - no uncommitted changes found ####" # Iterate over each forked project for PROJECTPATH in ${PROJECTPATHS}; do cd "${TOP}/${PROJECTPATH}" - echo "#### Pushing ${PROJECTPATH} merge to review ####" + echo -e "\n#### Pushing ${PROJECTPATH} merge to review ####" repo upload -c -y --no-verify -o topic="${TOPIC}" . done diff --git a/aosp-merger/upload-squash.sh b/aosp-merger/upload-squash.sh index cc4f92c8..7eb874c7 100755 --- a/aosp-merger/upload-squash.sh +++ b/aosp-merger/upload-squash.sh @@ -1,7 +1,7 @@ #!/bin/bash # # SPDX-FileCopyrightText: 2017, 2020-2022 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2022 The Calyx Institute +# SPDX-FileCopyrightText: 2021-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # @@ -56,10 +56,10 @@ fi # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') -echo "#### Squash branch = ${SQUASHBRANCH} ####" +echo -e "\n#### Squash branch = ${SQUASHBRANCH} ####" # Make sure manifest and forked repos are in a consistent state -echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####" +echo -e "\n#### Verifying there are no uncommitted changes on forked AOSP projects ####" for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do cd "${TOP}/${PROJECTPATH}" if [[ -n "$(git status --porcelain)" ]]; then @@ -72,7 +72,7 @@ echo "#### Verification complete - no uncommitted changes found ####" # Iterate over each forked project for PROJECTPATH in ${PROJECTPATHS}; do cd "${TOP}/${PROJECTPATH}" - echo "#### Pushing ${PROJECTPATH} squash to review ####" + echo -e "\n#### Pushing ${PROJECTPATH} squash to review ####" git checkout "${SQUASHBRANCH}" repo upload -c -y --no-verify -o topic="${TOPIC}" . done From 414444e33e0e66a77e148b3a633614d4d5058676 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 6 Nov 2023 23:08:16 +0200 Subject: [PATCH 005/111] aosp-merger: Check if branch exists before abandoning This gets rid of repo abandon errors. Change-Id: I97698b393e58365a56b02c3173b5482e8344d587 (cherry picked from commit c687bd73d9744a58a1d5b6a27d829f4663bcc674) --- aosp-merger/_merge_helper.sh | 4 +++- aosp-merger/_subtree_merge_helper.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index 71ae9548..9d259b87 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -66,7 +66,9 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" cd "${TOP}/${PROJECTPATH}" # Ditch any existing staging branches -repo abandon "${STAGINGBRANCH}" . +if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then + repo abandon "${STAGINGBRANCH}" . +fi repo start "${STAGINGBRANCH}" . if [ -f ".gitupstream-lineage" ]; then if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then diff --git a/aosp-merger/_subtree_merge_helper.sh b/aosp-merger/_subtree_merge_helper.sh index 67532b95..a199cd1d 100755 --- a/aosp-merger/_subtree_merge_helper.sh +++ b/aosp-merger/_subtree_merge_helper.sh @@ -66,7 +66,9 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" cd "${TOP}/${PROJECTPATH}" # Ditch any existing staging branches -repo abandon "${STAGINGBRANCH}" . +if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then + repo abandon "${STAGINGBRANCH}" . +fi repo start "${STAGINGBRANCH}" . if [ -f ".gitupstream" ]; then git fetch -q --force --tags "$(cat .gitupstream)" "${NEWTAG}" From 23a9aaff0dfd210edcd3f1e20ae82c99263bfdda Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 7 Nov 2023 00:28:14 +0530 Subject: [PATCH 006/111] November 2023 Security update Change-Id: Id5673809702360b491a63dceab5d7b75c26a526b --- vars/barbet | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/bramble | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/redfin | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 12 files changed, 115 insertions(+), 115 deletions(-) diff --git a/vars/barbet b/vars/barbet index d662d5ce..b155a3ed 100644 --- a/vars/barbet +++ b/vars/barbet @@ -25,23 +25,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.001" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r13" -readonly build_number="10754064" +readonly build_number="10817346" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-up1a.231005.007-factory-b7a4ba5f.zip" -readonly image_sha256="b7a4ba5f8bc1728d64a7ee800226ffa6a07799e9da2d34940e3974758ee7ed39" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-up1a.231105.001-factory-e3a984c3.zip" +readonly image_sha256="e3a984c37ec2ecf11da5ce94a910f02419128984b82bcbd8875a099bbbbd1d08" -readonly flash_url="https://flash.android.com/build/10754064?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/10817346?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-up1a.231005.007-5932cd00.zip" -readonly ota_sha256="5932cd006310f8d0ccab15db866115cb2ab7d0c5667d4847e411d3769e5c60b5" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-up1a.231105.001-b68f1873.zip" +readonly ota_sha256="b68f18733639e35cc33497b6094b0732cba39d9bc6b9d7a16c5f93317116b3aa" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-05" diff --git a/vars/bluejay b/vars/bluejay index b61594e7..27212d86 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-up1a.231005.007-factory-ab16eb7b.zip" -readonly image_sha256="ab16eb7b02a22030b4b5c2b7e768783ea15bdc0268874f543edbe25bb1409ce4" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-up1a.231105.003-factory-f21e8baf.zip" +readonly image_sha256="f21e8baff6fe9a59726a0dc47c89a3d2312c0ae89dd6725c5988d56e42231b1d" -readonly flash_url="https://flash.android.com/build/10754064?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-up1a.231005.007-b0c46acf.zip" -readonly ota_sha256="b0c46acfbd5aaaf93cba51944be86cce17ee30323c38af3c9a3bbfffbe535cb6" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-up1a.231105.003-8f9f1dcd.zip" +readonly ota_sha256="8f9f1dcd832bd1ed117b2375eb078aa3cae466d41ce9bb48584429c16e9c6d0b" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/bramble b/vars/bramble index a199c391..17c46c73 100644 --- a/vars/bramble +++ b/vars/bramble @@ -25,23 +25,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.001" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r13" -readonly build_number="10754064" +readonly build_number="10817346" -readonly image_url="https://dl.google.com/dl/android/aosp/bramble-up1a.231005.007-factory-fc548663.zip" -readonly image_sha256="fc54866335ba7efdcca38e61fcd939025f5140df2490a61c8a824f03267850b2" +readonly image_url="https://dl.google.com/dl/android/aosp/bramble-up1a.231105.001-factory-98e180ca.zip" +readonly image_sha256="98e180caf107c721657624aebebfe5b179cb7f692221099c6a5905d5546f59ae" -readonly flash_url="https://flash.android.com/build/10754064?target=bramble-user&signed" +readonly flash_url="https://flash.android.com/build/10817346?target=bramble-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-up1a.231005.007-231386fe.zip" -readonly ota_sha256="231386fedfa64b0456bf0287b485d89bb3cc96955075737d36a64a5d8fc9e5f3" +readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-up1a.231105.001-db54d066.zip" +readonly ota_sha256="db54d0663e2fadd098b1c11e00e98a9e7acf7e66d46316ca7350d8be66c54894" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-05" diff --git a/vars/cheetah b/vars/cheetah index eabc7bb8..8e6cbef6 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -25,23 +25,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-up1a.231005.007-factory-b556b487.zip" -readonly image_sha256="b556b4871aa41cd42783f7c8ac9d628e0241233deea89e319de522dc482c7b8b" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-up1a.231105.003-factory-c7f94298.zip" +readonly image_sha256="c7f94298b8d6984d31de792da1952d27b15e435a3dbdd7f0572e1b04172aa885" -readonly flash_url="https://flash.android.com/build/10754064?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-up1a.231005.007-7b69c467.zip" -readonly ota_sha256="7b69c467532aa84f6d8353cb8671f370d5bce3008879c222b39240f2940f00c5" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-up1a.231105.003-78a931aa.zip" +readonly ota_sha256="78a931aa8b83cefa13ea2bba17ee5762d1a41a47d4a968a35cfe77edad57d455" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/common b/vars/common index afacfcec..50145e61 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-release # Oct 2023 +readonly common_aosp_branch=android14-release # Nov 2023 -readonly prev_common_aosp_tag=NA # NA -readonly common_aosp_tag=android-14.0.0_r1 # Oct 2023 +readonly prev_common_aosp_tag=android-14.0.0_r1 # Oct 2023 +readonly common_aosp_tag=android-14.0.0_r14 # Nov 2023, Pixel 6 - 7a -readonly common_aosp_build_id=UP1A.231005.007 # Oct 2023, Pixel 4a (5G) - 7a +readonly common_aosp_build_id=UP1A.231105.003 # Nov 2023, Pixel 6 - 7a -readonly topic=fourteen +readonly topic=nov23 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index b4395e8c..7427dbd0 100644 --- a/vars/felix +++ b/vars/felix @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r80" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-up1a.231005.007-factory-9262aa73.zip" -readonly image_sha256="9262aa73d50ccc6c76e2910b9af20fbd1eaf7468f8008e8442c26751687ec397" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-up1a.231105.003-factory-604afb3f.zip" +readonly image_sha256="604afb3f39455ca7202ef3bf4fee60ff301b7b4f1742ea74f9716a5a98694cd0" -readonly flash_url="https://flash.android.com/build/10754064?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-up1a.231005.007-bd90d74b.zip" -readonly ota_sha256="bd90d74bb173b47b8e14af98d6395007ddb23f89b33dc71bb44358f35fb21218" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-up1a.231105.003-0bea8fc6.zip" +readonly ota_sha256="0bea8fc6ae437daae30895d9cef5bcfdad9bf7b27dd99ea46ed1b6e3d9ed8ae7" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/lynx b/vars/lynx index 1383ca32..614bc259 100644 --- a/vars/lynx +++ b/vars/lynx @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-up1a.231005.007-factory-aea9c006.zip" -readonly image_sha256="aea9c006e58d9c8b07ba7262c80a2fdde073c20811a82824abfd8e58c2575ce1" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-up1a.231105.003-factory-577d6e00.zip" +readonly image_sha256="577d6e00af21ce9f1351eef228c454f26db186416cc906508af6ebd8c89876c8" -readonly flash_url="https://flash.android.com/build/10754064?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-up1a.231005.007-e2085c49.zip" -readonly ota_sha256="e2085c49ca7f3b3dd9dc6dfacae5ceb87ec11969e25f929893a08e5e2cf9436a" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-up1a.231105.003-c4401775.zip" +readonly ota_sha256="c44017754386adf4b7950af007dd148db7b2f3f9f1a22e4bb6e57c8cef554fcd" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/oriole b/vars/oriole index ab8c5ab8..327eb043 100644 --- a/vars/oriole +++ b/vars/oriole @@ -22,23 +22,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-up1a.231005.007-factory-6db3bfe6.zip" -readonly image_sha256="6db3bfe63d5dad33aad03df2b9d828448eeaf523659d0b16697d251f618b535a" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-up1a.231105.003-factory-74f703f2.zip" +readonly image_sha256="74f703f2086bbd379e3bde628722256305caab4ab689d33d5a5ff617a33e3ca7" -readonly flash_url="https://flash.android.com/build/10754064?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-up1a.231005.007-b69a2c1b.zip" -readonly ota_sha256="b69a2c1bf439a6b292a9e2db401ad0e89497d147142255b2daf53f83be79ff34" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-up1a.231105.003-bb84d181.zip" +readonly ota_sha256="bb84d181a5d601884d316e71e8941f998d8eee084760821a55c47e5e3a0fcea2" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/panther b/vars/panther index a31b9064..5ea90df1 100644 --- a/vars/panther +++ b/vars/panther @@ -22,23 +22,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-up1a.231005.007-factory-09c6d453.zip" -readonly image_sha256="09c6d453f6a1d2c58a791bb113a489b38d4d38d58f138fecc432280097c25931" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-up1a.231105.003-factory-1f4e21fc.zip" +readonly image_sha256="1f4e21fcd5cb253d014f158bb56dc86ca4a83bafca3f57d76a38a660faa4dea8" -readonly flash_url="https://flash.android.com/build/10754064?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-up1a.231005.007-16d1f4a7.zip" -readonly ota_sha256="16d1f4a73bae65cd4e95b41c81ccf0e576c8d87f9c7787c0aaf10c6fff43797c" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-up1a.231105.003-935105ec.zip" +readonly ota_sha256="935105ec48561dc71f56283dc85cea8420fddd0c12c7248c28ab4c2670344903" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/raven b/vars/raven index a05a454a..67828a73 100644 --- a/vars/raven +++ b/vars/raven @@ -24,23 +24,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-up1a.231005.007-factory-7894f2e7.zip" -readonly image_sha256="7894f2e79933f4cf32e26146175e5326e684d3b5801955adfdfb1dd227f6230d" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-up1a.231105.003-factory-76a795d5.zip" +readonly image_sha256="76a795d52c10d8eb08c2c4cacadf0706f3d018bfea05491afb3acf90b6061e13" -readonly flash_url="https://flash.android.com/build/10754064?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-up1a.231005.007-59a0a7fc.zip" -readonly ota_sha256="59a0a7fc025750d9496fc047320d9cb9f5e3c77a8c559f3e36de61a093075c30" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-up1a.231105.003-f616529c.zip" +readonly ota_sha256="f616529c0fb2c00f9a8b57d381ce1934ed892e5e2bdd9b17c4b1ac767730fcdd" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" diff --git a/vars/redfin b/vars/redfin index e6a46788..2944e0c7 100644 --- a/vars/redfin +++ b/vars/redfin @@ -26,23 +26,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.001" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r75" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r13" -readonly build_number="10754064" +readonly build_number="10817346" -readonly image_url="https://dl.google.com/dl/android/aosp/redfin-up1a.231005.007-factory-c0da18e6.zip" -readonly image_sha256="c0da18e6c2b7de06bc732c1fdad2d3e4d2402f6330f67d961fbd862347ca4e8d" +readonly image_url="https://dl.google.com/dl/android/aosp/redfin-up1a.231105.001-factory-4e32c252.zip" +readonly image_sha256="4e32c25205ac3969c75723b7b283d632cc1d209da4014aa8ee9e083110855475" -readonly flash_url="https://flash.android.com/build/10754064?target=redfin-user&signed" +readonly flash_url="https://flash.android.com/build/10817346?target=redfin-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-up1a.231005.007-4593d7c6.zip" -readonly ota_sha256="4593d7c611b0712b0b508f41363bcc44d0247ce7396d79afc9fb395185e6a960" +readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-up1a.231105.001-cb2967ff.zip" +readonly ota_sha256="cb2967ff065f205953b29e31ef9a598c7f35167d5ebabb5e79ee05efb05b5b9d" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-05" diff --git a/vars/tangorpro b/vars/tangorpro index 1ede5dbc..97dbeabe 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -23,23 +23,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231005.007" +readonly build_id="UP1A.231105.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-13.0.0_r76" -readonly aosp_tag="android-14.0.0_r1" +readonly prev_aosp_tag="android-14.0.0_r1" +readonly aosp_tag="android-14.0.0_r14" -readonly build_number="10754064" +readonly build_number="11010452" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-up1a.231005.007-factory-1b708c9a.zip" -readonly image_sha256="1b708c9ae9e2f1ffebc35f4fff7a2dd0ef225b13e7e9b8641fa018992e00eec5" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-up1a.231105.003-factory-71505172.zip" +readonly image_sha256="71505172110da88d0c6708dbbcd1ebf3458a116db866550cfc4c4cae9d266b9c" -readonly flash_url="https://flash.android.com/build/10754064?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11010452?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-up1a.231005.007-176bbf3c.zip" -readonly ota_sha256="176bbf3cd07aa7f2d2c9bcc45e23a98ee18443b523e4ed523b31deb4b93bf478" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-up1a.231105.003-a208b1f2.zip" +readonly ota_sha256="a208b1f2cebeeaa356ff7fd3ed61af7315f26638eb0677dbf96e630db64678be" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-01" From 273309bd32bb611715877bbbaff7764b3dd6e9b3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 3 Nov 2023 19:33:15 +0200 Subject: [PATCH 007/111] aosp-merger: Changes to allow merging LineageOS to AOSP repositories Change-Id: Ibea036b9c8518320b948a777e049a589473d3730 --- aosp-merger/_merge_helper.sh | 11 ++++++++--- aosp-merger/aosp-merger.sh | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index 9d259b87..dcfa59d5 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -7,7 +7,7 @@ # usage() { - echo "Usage ${0} -p -o -c -n -b " + echo "Usage ${0} -p -o -c -n -b --lineage" } # Verify argument count @@ -16,6 +16,8 @@ if [ "${#}" -eq 0 ]; then exit 1 fi +LINEAGE=false + while [ "${#}" -gt 0 ]; do case "${1}" in -p | --project-path ) @@ -33,6 +35,9 @@ while [ "${#}" -gt 0 ]; do -b | --branch-suffix ) BRANCHSUFFIX="${2}"; shift ;; + -l | --lineage ) + LINEAGE=true; shift + ;; * ) usage exit 1 @@ -70,7 +75,7 @@ if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then repo abandon "${STAGINGBRANCH}" . fi repo start "${STAGINGBRANCH}" . -if [ -f ".gitupstream-lineage" ]; then +if [ -f ".gitupstream-lineage" ] && [ "${LINEAGE}" = true ]; then if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then LINEAGEBRANCH="$(cat .gitupstream-lineage | cut -d ' ' -f 2)" else @@ -108,7 +113,7 @@ fi if [[ "${OPERATION}" == "merge" ]]; then echo -e "\n#### Merging ${NEWTAG} into ${PROJECTPATH} ####" - if [ -f ".gitupstream-lineage" ]; then + if [ -f ".gitupstream-lineage" ] && [ "${LINEAGE}" = true ]; then git merge --no-commit --log lineage/"${LINEAGEBRANCH}" && git commit --no-edit else git merge --no-commit --log "${NEWTAG}" && git commit --no-edit diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh index d90194e2..ad992ef7 100755 --- a/aosp-merger/aosp-merger.sh +++ b/aosp-merger/aosp-merger.sh @@ -157,7 +157,7 @@ push_clo_merge() { # Merge LineageOS to forks merge_lineage() { - "${script_path}"/_merge_helper.sh --project-path "${repo}" --new-tag "${1}" --branch-suffix "${os_branch}_merge-${1}" + "${script_path}"/_merge_helper.sh --project-path "${repo}" --new-tag "${1}" --branch-suffix "${os_branch}_merge-${1}" --lineage } post_lineage_merge() { From 351e3bc66409f7e427c92452038ee8767d7c0024 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 7 Nov 2023 18:16:02 +0530 Subject: [PATCH 008/111] sunfish: November 2023 update Change-Id: Ic7adb35b912b9dd90230828d97f90579bedf006f --- vars/sunfish | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vars/sunfish b/vars/sunfish index 2e2097ed..00c5a0c4 100644 --- a/vars/sunfish +++ b/vars/sunfish @@ -23,23 +23,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="TQ3A.230805.001" +readonly build_id="TQ3A.230805.001.S1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android13-qpr3-release" +readonly aosp_branch="android13-qpr3-s14-release" -readonly prev_aosp_tag="android-13.0.0_r61" -readonly aosp_tag="android-13.0.0_r67" +readonly prev_aosp_tag="android-13.0.0_r67" +readonly aosp_tag="android-13.0.0_r83" -readonly build_number="10316531" +readonly build_number="10786265" -readonly image_url="https://dl.google.com/dl/android/aosp/sunfish-tq3a.230805.001-factory-b3d86cc6.zip" -readonly image_sha256="b3d86cc61452d79b7e67426fe40594ede549ead3ab20d7729caf1a1dfbd8e107" +readonly image_url="https://dl.google.com/dl/android/aosp/sunfish-tq3a.230805.001.s1-factory-82902ea9.zip" +readonly image_sha256="82902ea98c80f1a22706279a30d2bc46aa55cbe60703c9a02ba043bd052c6d99" -readonly flash_url="https://flash.android.com/build/10316531?target=sunfish-user&signed" +readonly flash_url="https://flash.android.com/build/10786265?target=sunfish-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/sunfish-ota-tq3a.230805.001-01fd34b2.zip" -readonly ota_sha256="01fd34b206152a3559039161c9874ab03df37da4268b86a9e0be899de5fc0af7" +readonly ota_url="https://dl.google.com/dl/android/aosp/sunfish-ota-tq3a.230805.001.s1-965296b1.zip" +readonly ota_sha256="965296b1498b1d71bbf4013088b34213d5e6bc4dc836a7d06d1534eaf7621336" readonly security_patch="2023-08-05" From f6b1f7c65ccec8bc7cec4f44d9a5fe3392c569af Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 29 Nov 2023 15:30:52 +0000 Subject: [PATCH 009/111] Revert "aosp-merger: Check if branch exists before abandoning" This reverts commit 414444e33e0e66a77e148b3a633614d4d5058676. Reason for revert: Not working now for some reason Change-Id: I0b97da59b324f08449aaf643c13f0c563ce642ef --- aosp-merger/_merge_helper.sh | 4 +--- aosp-merger/_subtree_merge_helper.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index dcfa59d5..cca88d35 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -71,9 +71,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" cd "${TOP}/${PROJECTPATH}" # Ditch any existing staging branches -if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then - repo abandon "${STAGINGBRANCH}" . -fi +repo abandon "${STAGINGBRANCH}" . repo start "${STAGINGBRANCH}" . if [ -f ".gitupstream-lineage" ] && [ "${LINEAGE}" = true ]; then if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then diff --git a/aosp-merger/_subtree_merge_helper.sh b/aosp-merger/_subtree_merge_helper.sh index a199cd1d..67532b95 100755 --- a/aosp-merger/_subtree_merge_helper.sh +++ b/aosp-merger/_subtree_merge_helper.sh @@ -66,9 +66,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" cd "${TOP}/${PROJECTPATH}" # Ditch any existing staging branches -if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then - repo abandon "${STAGINGBRANCH}" . -fi +repo abandon "${STAGINGBRANCH}" . repo start "${STAGINGBRANCH}" . if [ -f ".gitupstream" ]; then git fetch -q --force --tags "$(cat .gitupstream)" "${NEWTAG}" From e57c1953c234544cc3914c0a718133b7cf7cb480 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Oct 2023 03:45:13 +0300 Subject: [PATCH 010/111] vars: shusky Change-Id: I5dc8baa11a0bcbf596f155ab00a27bf2358e215a --- vars/cheetah | 1 - vars/devices | 2 ++ vars/husky | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ vars/pixels | 2 ++ vars/shiba | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 vars/husky create mode 100644 vars/shiba diff --git a/vars/cheetah b/vars/cheetah index 8e6cbef6..f21381c7 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -17,7 +17,6 @@ readonly firmware_partitions=( device_repos=( device/google/gs201 device/google/gs201-sepolicy - device/google/gs-common device/google/pantah ) diff --git a/vars/devices b/vars/devices index fb6c5f39..4d1f7cf0 100644 --- a/vars/devices +++ b/vars/devices @@ -1,6 +1,8 @@ # All supported devices # Usage: ${devices[@]} readonly devices=( + husky + shiba felix tangorpro lynx diff --git a/vars/husky b/vars/husky new file mode 100644 index 00000000..e4a10193 --- /dev/null +++ b/vars/husky @@ -0,0 +1,49 @@ +# Pixel 8 Pro + +# Usage: ${firmware_partitions[@]} +readonly firmware_partitions=( + bl1 + pbl + bl2 + abl + bl31 + tzsw + gcf + gsa + gsa_bl1 + ldfw + modem +) + +# Usage: ${device_repos[@]} +device_repos=( + device/google/gs-common + device/google/zuma + device/google/zuma-sepolicy + device/google/shusky +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="UD1A.230803.041" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android14-d1-release" + +readonly prev_aosp_tag="NA" +readonly aosp_tag="android-14.0.0_r11" + +readonly build_number="10808477" + +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ud1a.230803.041-factory-f26063c5.zip" +readonly image_sha256="f26063c5cd9d4810d2f69007dbb8af5f7f06a1e7a2f866a1e8a121e89c445c00" + +readonly flash_url="https://flash.android.com/build/10808477?target=husky-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ud1a.230803.041-cca7e111.zip" +readonly ota_sha256="cca7e1116663aadbf103f7c841d301bf5f0ea6a680e8774391bc45ea282e27f9" + +readonly security_patch="2023-10-05" diff --git a/vars/pixels b/vars/pixels index 55571687..7a6613b0 100644 --- a/vars/pixels +++ b/vars/pixels @@ -1,6 +1,8 @@ # Google Pixels, currently supported in AOSP # Usage: ${devices[@]} readonly devices=( + husky + shiba felix tangorpro lynx diff --git a/vars/shiba b/vars/shiba new file mode 100644 index 00000000..fab07294 --- /dev/null +++ b/vars/shiba @@ -0,0 +1,46 @@ +# Pixel 8 + +# Usage: ${firmware_partitions[@]} +readonly firmware_partitions=( + bl1 + pbl + bl2 + abl + bl31 + tzsw + gcf + gsa + gsa_bl1 + ldfw + modem +) + +# Usage: ${device_repos[@]} +device_repos=( + # common repos in husky +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="UD1A.230803.041" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android14-d1-release" + +readonly prev_aosp_tag="NA" +readonly aosp_tag="android-14.0.0_r11" + +readonly build_number="10808477" + +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ud1a.230803.041-factory-3ed11735.zip" +readonly image_sha256="3ed11735021f723d9dd49ba98170d4a5ad0d88e9c54338723674886a2a334b54" + +readonly flash_url="https://flash.android.com/build/10808477?target=shiba-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ud1a.230803.041-6bbb528c.zip" +readonly ota_sha256="6bbb528c219cc0065c6a64cd82ddab0b138591b3064580659b1163c5f397c7bc" + +readonly security_patch="2023-10-05" From 7a23539b29d5ff1e0bbd2b5dd7be344b989803f5 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 9 Nov 2023 00:49:26 +0200 Subject: [PATCH 011/111] vars: November 2023 Security update - Pixel 8 version Change-Id: Ia6130c0518cbb7fdc2af8e91c981d79319a6d159 --- vars/husky | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/vars/husky b/vars/husky index e4a10193..cca69f28 100644 --- a/vars/husky +++ b/vars/husky @@ -27,23 +27,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UD1A.230803.041" +readonly build_id="UD1A.231105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-d1-release" -readonly prev_aosp_tag="NA" -readonly aosp_tag="android-14.0.0_r11" +readonly prev_aosp_tag="android-14.0.0_r11" +readonly aosp_tag="android-14.0.0_r12" -readonly build_number="10808477" +readonly build_number="11010374" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ud1a.230803.041-factory-f26063c5.zip" -readonly image_sha256="f26063c5cd9d4810d2f69007dbb8af5f7f06a1e7a2f866a1e8a121e89c445c00" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ud1a.231105.004-factory-38d2e6cf.zip" +readonly image_sha256="38d2e6cff75e04a15311d3a4d9f969bfd5c2d1b030f165258d5bd8be88b3b5d5" -readonly flash_url="https://flash.android.com/build/10808477?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11010374?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ud1a.230803.041-cca7e111.zip" -readonly ota_sha256="cca7e1116663aadbf103f7c841d301bf5f0ea6a680e8774391bc45ea282e27f9" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ud1a.231105.004-eb8f844a.zip" +readonly ota_sha256="eb8f844a58bc45c451b8b82bb17f30e44630ce78771da9748979d3b1c81acb4d" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-05" diff --git a/vars/shiba b/vars/shiba index fab07294..e89f9a02 100644 --- a/vars/shiba +++ b/vars/shiba @@ -24,23 +24,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UD1A.230803.041" +readonly build_id="UD1A.231105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-d1-release" -readonly prev_aosp_tag="NA" -readonly aosp_tag="android-14.0.0_r11" +readonly prev_aosp_tag="android-14.0.0_r11" +readonly aosp_tag="android-14.0.0_r12" -readonly build_number="10808477" +readonly build_number="11010374" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ud1a.230803.041-factory-3ed11735.zip" -readonly image_sha256="3ed11735021f723d9dd49ba98170d4a5ad0d88e9c54338723674886a2a334b54" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ud1a.231105.004-factory-0b858d98.zip" +readonly image_sha256="0b858d98fb1829dd10f5196e509cde7a155cae1e3a6628b4f196e230ab87601a" -readonly flash_url="https://flash.android.com/build/10808477?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11010374?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ud1a.230803.041-6bbb528c.zip" -readonly ota_sha256="6bbb528c219cc0065c6a64cd82ddab0b138591b3064580659b1163c5f397c7bc" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ud1a.231105.004-49029a3a.zip" +readonly ota_sha256="49029a3a78d00c67bc869bb6f9a744d182a9de369d1acf89ef7cdf823e80e5f6" -readonly security_patch="2023-10-05" +readonly security_patch="2023-11-05" From 4320681d3a9b639fbba45bb9b9bdb90d018445d7 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 6 Dec 2023 21:34:36 +0200 Subject: [PATCH 012/111] vars: RIP bramble/redfin Change-Id: Ia86a2295f9a68ceecb34fab29c5120fac9a8338b --- vars/pixels | 2 -- 1 file changed, 2 deletions(-) diff --git a/vars/pixels b/vars/pixels index 7a6613b0..9b0ff1a4 100644 --- a/vars/pixels +++ b/vars/pixels @@ -12,6 +12,4 @@ readonly devices=( raven oriole barbet - redfin - bramble ) From 104490d77e1aa7f0cf72f2b06d6c6978ff7a4c98 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 6 Dec 2023 22:41:35 +0200 Subject: [PATCH 013/111] vars: December 2023 Quarterly Platform Release and Security update Change-Id: Ibe5ad02cd6f98acfe9ec8188bc3422539c28fcd6 --- vars/barbet | 25 +++++++++++++------------ vars/bluejay | 22 +++++++++++----------- vars/bramble | 2 +- vars/cheetah | 22 +++++++++++----------- vars/common | 10 +++++----- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/redfin | 3 +-- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- 14 files changed, 130 insertions(+), 130 deletions(-) diff --git a/vars/barbet b/vars/barbet index b155a3ed..a0d8a269 100644 --- a/vars/barbet +++ b/vars/barbet @@ -18,30 +18,31 @@ readonly firmware_partitions=( # Usage: ${device_repos[@]} device_repos=( - # common repos in redfin + device/google/redbull + device/google/redbull-sepolicy device/google/barbet device/google/barbet-sepolicy ) # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.001" +readonly build_id="UQ1A.231205.014" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r13" +readonly prev_aosp_tag="android-14.0.0_r13" +readonly aosp_tag="android-14.0.0_r16" -readonly build_number="10817346" +readonly build_number="11049176" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-up1a.231105.001-factory-e3a984c3.zip" -readonly image_sha256="e3a984c37ec2ecf11da5ce94a910f02419128984b82bcbd8875a099bbbbd1d08" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-uq1a.231205.014-factory-0297d8d7.zip" +readonly image_sha256="0297d8d7eecc7a6180b5e54a3cd3014ff72fc181ba60eeec805e6d596467066d" -readonly flash_url="https://flash.android.com/build/10817346?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11049176?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-up1a.231105.001-b68f1873.zip" -readonly ota_sha256="b68f18733639e35cc33497b6094b0732cba39d9bc6b9d7a16c5f93317116b3aa" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-uq1a.231205.014-27adb3f8.zip" +readonly ota_sha256="27adb3f8efc5ea37e5111b5bb1557ae7cac9749d5d1401f5a288c9ed24cb2e57" -readonly security_patch="2023-11-05" +readonly security_patch="2023-12-05" diff --git a/vars/bluejay b/vars/bluejay index 27212d86..330a1012 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-up1a.231105.003-factory-f21e8baf.zip" -readonly image_sha256="f21e8baff6fe9a59726a0dc47c89a3d2312c0ae89dd6725c5988d56e42231b1d" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-uq1a.231205.015-factory-cc482de8.zip" +readonly image_sha256="cc482de897f03b877a003e02754dc1041a03e842548df50baa31a2f0b7dbfa8d" -readonly flash_url="https://flash.android.com/build/11010452?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-up1a.231105.003-8f9f1dcd.zip" -readonly ota_sha256="8f9f1dcd832bd1ed117b2375eb078aa3cae466d41ce9bb48584429c16e9c6d0b" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-uq1a.231205.015-2503078c.zip" +readonly ota_sha256="2503078c241b1edb8df6a14481b8a7fc29792bc4b00c240336e334c335c5581e" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/bramble b/vars/bramble index 17c46c73..1113dd41 100644 --- a/vars/bramble +++ b/vars/bramble @@ -18,7 +18,7 @@ readonly firmware_partitions=( # Usage: ${device_repos[@]} device_repos=( - # common repos in redfin + # common repos in barbet device/google/bramble device/google/bramble-sepolicy ) diff --git a/vars/cheetah b/vars/cheetah index f21381c7..6ab96335 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -24,23 +24,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-up1a.231105.003-factory-c7f94298.zip" -readonly image_sha256="c7f94298b8d6984d31de792da1952d27b15e435a3dbdd7f0572e1b04172aa885" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-uq1a.231205.015-factory-99c57348.zip" +readonly image_sha256="99c573488bcff356696d3072d9d4c57cbf902df55cf723b57c4b2e3366d4809c" -readonly flash_url="https://flash.android.com/build/11010452?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-up1a.231105.003-78a931aa.zip" -readonly ota_sha256="78a931aa8b83cefa13ea2bba17ee5762d1a41a47d4a968a35cfe77edad57d455" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-uq1a.231205.015-1811b943.zip" +readonly ota_sha256="1811b943337d5b50c3266d4bc8bf739c1c543b0e431e2f23fba8c9ac4d6a5ec2" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/common b/vars/common index 50145e61..8ac64dc3 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-release # Nov 2023 +readonly common_aosp_branch=android14-qpr1-release # Dec 2023 -readonly prev_common_aosp_tag=android-14.0.0_r1 # Oct 2023 -readonly common_aosp_tag=android-14.0.0_r14 # Nov 2023, Pixel 6 - 7a +readonly prev_common_aosp_tag=android-14.0.0_r14 # Nov 2023, Pixel 6 - 7a +readonly common_aosp_tag=android-14.0.0_r17 # Dec 2023, Pixel 6 - 8 -readonly common_aosp_build_id=UP1A.231105.003 # Nov 2023, Pixel 6 - 7a +readonly common_aosp_build_id=UQ1A.231205.015 # Dec 2023, Pixel 6 - 8 -readonly topic=nov23 +readonly topic=dec23 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 7427dbd0..704dcab3 100644 --- a/vars/felix +++ b/vars/felix @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-up1a.231105.003-factory-604afb3f.zip" -readonly image_sha256="604afb3f39455ca7202ef3bf4fee60ff301b7b4f1742ea74f9716a5a98694cd0" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-uq1a.231205.015-factory-7bf17efb.zip" +readonly image_sha256="7bf17efba4e53f81a6349fc93e535cde0c25cb8b190375600260c37ca0feb3e7" -readonly flash_url="https://flash.android.com/build/11010452?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-up1a.231105.003-0bea8fc6.zip" -readonly ota_sha256="0bea8fc6ae437daae30895d9cef5bcfdad9bf7b27dd99ea46ed1b6e3d9ed8ae7" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-uq1a.231205.015-128c9c6b.zip" +readonly ota_sha256="128c9c6bb2c52eb727e37a73b2f9cc0022ef66688dfb46443892b68ac27cfd3c" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/husky b/vars/husky index cca69f28..2c583629 100644 --- a/vars/husky +++ b/vars/husky @@ -27,23 +27,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UD1A.231105.004" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-d1-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r11" -readonly aosp_tag="android-14.0.0_r12" +readonly prev_aosp_tag="android-14.0.0_r12" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010374" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ud1a.231105.004-factory-38d2e6cf.zip" -readonly image_sha256="38d2e6cff75e04a15311d3a4d9f969bfd5c2d1b030f165258d5bd8be88b3b5d5" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-uq1a.231205.015-factory-3cd41d9b.zip" +readonly image_sha256="3cd41d9b3138e1abece66c48e46c5218a1ee09cfb4c86c6c9b49f9cb18c5e102" -readonly flash_url="https://flash.android.com/build/11010374?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ud1a.231105.004-eb8f844a.zip" -readonly ota_sha256="eb8f844a58bc45c451b8b82bb17f30e44630ce78771da9748979d3b1c81acb4d" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-uq1a.231205.015-c52b44d3.zip" +readonly ota_sha256="c52b44d343081f59a0018e6749a0c220c314035d9e2be60a7bd93e86ef7543f6" -readonly security_patch="2023-11-05" +readonly security_patch="2023-12-05" diff --git a/vars/lynx b/vars/lynx index 614bc259..6d09a3a9 100644 --- a/vars/lynx +++ b/vars/lynx @@ -23,23 +23,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-up1a.231105.003-factory-577d6e00.zip" -readonly image_sha256="577d6e00af21ce9f1351eef228c454f26db186416cc906508af6ebd8c89876c8" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-uq1a.231205.015-factory-f4fe5ddf.zip" +readonly image_sha256="f4fe5ddfc5dd50091a00a2f915d1519e2c73864e2482d69d182b757648b4c6f1" -readonly flash_url="https://flash.android.com/build/11010452?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-up1a.231105.003-c4401775.zip" -readonly ota_sha256="c44017754386adf4b7950af007dd148db7b2f3f9f1a22e4bb6e57c8cef554fcd" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-uq1a.231205.015-94684930.zip" +readonly ota_sha256="94684930977f3de6d55f35fa1e98d8c2ce65682496dbaf2f311a0cdb209f762c" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/oriole b/vars/oriole index 327eb043..ace343a1 100644 --- a/vars/oriole +++ b/vars/oriole @@ -22,23 +22,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-up1a.231105.003-factory-74f703f2.zip" -readonly image_sha256="74f703f2086bbd379e3bde628722256305caab4ab689d33d5a5ff617a33e3ca7" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-uq1a.231205.015-factory-6a8ae3fb.zip" +readonly image_sha256="6a8ae3fba1cd573bc89caef2c012c70b169813dc808c1448ec4b0e71d0b7318b" -readonly flash_url="https://flash.android.com/build/11010452?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-up1a.231105.003-bb84d181.zip" -readonly ota_sha256="bb84d181a5d601884d316e71e8941f998d8eee084760821a55c47e5e3a0fcea2" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-uq1a.231205.015-7729bb7e.zip" +readonly ota_sha256="7729bb7e4f9358178ca8b0457d4b0db5f78e2ec6b46d548d04c3f4fd864accd4" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/panther b/vars/panther index 5ea90df1..bc2c0ead 100644 --- a/vars/panther +++ b/vars/panther @@ -22,23 +22,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-up1a.231105.003-factory-1f4e21fc.zip" -readonly image_sha256="1f4e21fcd5cb253d014f158bb56dc86ca4a83bafca3f57d76a38a660faa4dea8" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-uq1a.231205.015-factory-9bc852a1.zip" +readonly image_sha256="9bc852a1f625b68361d18911d2fbfbb55cd6b229135adf4619c49c7d77ed3f08" -readonly flash_url="https://flash.android.com/build/11010452?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-up1a.231105.003-935105ec.zip" -readonly ota_sha256="935105ec48561dc71f56283dc85cea8420fddd0c12c7248c28ab4c2670344903" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-uq1a.231205.015-b2ebb00d.zip" +readonly ota_sha256="b2ebb00d528079204265298aaecb0a51f8b46136942e7afd04f7e62c3034abf7" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/raven b/vars/raven index 67828a73..edfbdcb1 100644 --- a/vars/raven +++ b/vars/raven @@ -24,23 +24,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-up1a.231105.003-factory-76a795d5.zip" -readonly image_sha256="76a795d52c10d8eb08c2c4cacadf0706f3d018bfea05491afb3acf90b6061e13" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-uq1a.231205.015-factory-4f0bf638.zip" +readonly image_sha256="4f0bf638939776d6189381a5bfaa882a9e62446b0f769c43097682a80b947698" -readonly flash_url="https://flash.android.com/build/11010452?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-up1a.231105.003-f616529c.zip" -readonly ota_sha256="f616529c0fb2c00f9a8b57d381ce1934ed892e5e2bdd9b17c4b1ac767730fcdd" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-uq1a.231205.015-36102566.zip" +readonly ota_sha256="3610256685106d847d92a437cf54ebc9263d938c0b8726a855b5665c865f0516" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" diff --git a/vars/redfin b/vars/redfin index 2944e0c7..50ac3c16 100644 --- a/vars/redfin +++ b/vars/redfin @@ -18,8 +18,7 @@ readonly firmware_partitions=( # Usage: ${device_repos[@]} device_repos=( - device/google/redbull - device/google/redbull-sepolicy + # common repos in barbet device/google/redfin device/google/redfin-sepolicy ) diff --git a/vars/shiba b/vars/shiba index e89f9a02..77585976 100644 --- a/vars/shiba +++ b/vars/shiba @@ -24,23 +24,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UD1A.231105.004" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-d1-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r11" -readonly aosp_tag="android-14.0.0_r12" +readonly prev_aosp_tag="android-14.0.0_r12" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010374" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ud1a.231105.004-factory-0b858d98.zip" -readonly image_sha256="0b858d98fb1829dd10f5196e509cde7a155cae1e3a6628b4f196e230ab87601a" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-uq1a.231205.015-factory-ac56e72d.zip" +readonly image_sha256="ac56e72deba62082ee2dcc1dd9438ce3c6cfd2dfa2f5a6e74d61ac3e528dfe87" -readonly flash_url="https://flash.android.com/build/11010374?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ud1a.231105.004-49029a3a.zip" -readonly ota_sha256="49029a3a78d00c67bc869bb6f9a744d182a9de369d1acf89ef7cdf823e80e5f6" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-uq1a.231205.015-4033cf00.zip" +readonly ota_sha256="4033cf0085e6a831758513a1c6cb9d9d40ef0357d968cae89fa554f8c869bc0d" -readonly security_patch="2023-11-05" +readonly security_patch="2023-12-05" diff --git a/vars/tangorpro b/vars/tangorpro index 97dbeabe..b238a783 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -23,23 +23,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.003" +readonly build_id="UQ1A.231205.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-release" +readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r14" +readonly prev_aosp_tag="android-14.0.0_r14" +readonly aosp_tag="android-14.0.0_r17" -readonly build_number="11010452" +readonly build_number="11084887" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-up1a.231105.003-factory-71505172.zip" -readonly image_sha256="71505172110da88d0c6708dbbcd1ebf3458a116db866550cfc4c4cae9d266b9c" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-uq1a.231205.015-factory-90e76582.zip" +readonly image_sha256="90e7658230ae00ee6ce0dd741f1e2e80278b72984bb3774598a52e1152d49ae4" -readonly flash_url="https://flash.android.com/build/11010452?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11084887?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-up1a.231105.003-a208b1f2.zip" -readonly ota_sha256="a208b1f2cebeeaa356ff7fd3ed61af7315f26638eb0677dbf96e630db64678be" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-uq1a.231205.015-1b0c6e1e.zip" +readonly ota_sha256="1b0c6e1e97979f84416a1d1ce423731d1deebfb5c86b4499344b6fa5ac3e107a" -readonly security_patch="2023-11-01" +readonly security_patch="2023-12-05" From 0cc4bda76b5bebb1117a5dc623f87ecfa35b8302 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Sat, 16 Sep 2023 00:39:01 +0200 Subject: [PATCH 014/111] carriersettings-extractor: ignore threshold arrays with size > 4 These cause com.android.phone to crash: E AndroidRuntime: FATAL EXCEPTION: main E AndroidRuntime: Process: com.android.phone, PID: 4429 E AndroidRuntime: java.lang.IllegalArgumentException: thresholds length must between 1 and 4 E AndroidRuntime: at android.telephony.SignalThresholdInfo$Builder.setThresholds(SignalThresholdInfo.java:422) Change-Id: I1a2721063bc7dae0d3415a59883a5470518c47a1 --- carriersettings-extractor/carriersettings_extractor.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/carriersettings-extractor/carriersettings_extractor.py b/carriersettings-extractor/carriersettings_extractor.py index d6e6f71d..9ade24dd 100755 --- a/carriersettings-extractor/carriersettings_extractor.py +++ b/carriersettings-extractor/carriersettings_extractor.py @@ -59,6 +59,12 @@ def parse_args(): "read_only_apn_types_string_array", "read_only_apn_fields_string_array"] +threshold_configs = ["5g_nr_ssrsrp_thresholds_int_array", + "5g_nr_sssinr_thresholds_int_array", + "gsm_rssi_thresholds_int_array", + "lte_rsrp_thresholds_int_array", + "lte_rssnr_thresholds_int_array", + "wcdma_rscp_thresholds_int_array"] def extract_elements(carrier_config_element, config): if config.key in unwanted_configs: @@ -121,6 +127,8 @@ def extract_elements(carrier_config_element, config): ) carrier_config_item.set('value', value) elif value_type == 'int_array': + if config.key in threshold_configs and len(getattr(config, value_type).item) > 4: + return carrier_config_subelement = ET.SubElement( carrier_config_element, 'int-array', From 448cf2765008f445bce2369044941f2def8b7e0e Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 14 Dec 2023 22:08:23 +0200 Subject: [PATCH 015/111] vars: Add missing shusky-sepolicy Change-Id: Id49cefc9d220212d090f3c587a3b522576059ffd --- vars/husky | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/husky b/vars/husky index 2c583629..1b7f56de 100644 --- a/vars/husky +++ b/vars/husky @@ -21,6 +21,7 @@ device_repos=( device/google/zuma device/google/zuma-sepolicy device/google/shusky + device/google/shusky-sepolicy ) readonly fbpk_version="v2" From 65615eb60cdcd51a7725a1c6d06266ad578f089a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 24 Aug 2023 10:41:05 +0300 Subject: [PATCH 016/111] motorola: Import star extract script imported from https://github.com/HemanthJabalpuri/star at e77390046256de0c4044fa480b2815011a3fa8ed Change-Id: Iea4cdd8655d3aab9cfd3e55bdcafdba072b90462 --- motorola/star.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 motorola/star.sh diff --git a/motorola/star.sh b/motorola/star.sh new file mode 100755 index 00000000..b89a1252 --- /dev/null +++ b/motorola/star.sh @@ -0,0 +1,46 @@ +#!/bin/sh + +# SPDX-License-Identifier: CC0-1.0 + +# This basic program is used for unpacking Motorola archives which are made using single image tar(star) utility +# can run in dash. dd, od, tr are used mainly(busybox also compatible) +# +# Created : 1st Feb 2023 +# Author : HemanthJabalpuri + +if [ $# -lt 2 ]; then + echo "Usage: star.sh file outdir" + exit +fi + +f="$1" +outdir="$2" + +mkdir -p "$outdir" 2>/dev/null + +getData() { + dd if="$f" bs=1 skip=$1 count=$2 2>/dev/null +} + +getLong() { + getData $1 8 | od -A n -t u8 | tr -d " " +} + +magic=$(getData 0 15) +if [ "$magic" != "SINGLE_N_LONELY" ]; then + echo " Unsupported"; exit 1 +fi + +seekoff=256 +for i in $(seq 64); do + name="$(getData $seekoff 248)" + [ "$name" = "LONELY_N_SINGLE" ] && break + length="$(getLong $((seekoff+248)))" + offset="$((seekoff+256))" + pad=$((length%4096)) + [ "$pad" -ne 0 ] && pad=$((4096-pad)) + echo "Name: $name, Offset: $offset, Size: $length, Padding: $pad" + + dd if="$f" of="$outdir/$name" iflag=skip_bytes,count_bytes status=none bs=4096 skip=$offset count=$length + seekoff="$((offset+length+pad))" +done From 435f6f6b76b60d806cca244cab484ef2fd38e3a0 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 30 Nov 2023 18:34:09 +0200 Subject: [PATCH 017/111] motorola: Add info dump script For now this just prints information collected from an extracted zip. In the future we can write something that updates the device trees. Change-Id: I5b00f77ff11828e2c2870c8ea00054e2ce5eef14 --- motorola/info.sh | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100755 motorola/info.sh diff --git a/motorola/info.sh b/motorola/info.sh new file mode 100755 index 00000000..f936755b --- /dev/null +++ b/motorola/info.sh @@ -0,0 +1,81 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2023 The Calyx Institute +# +# SPDX-License-Identifier: Apache-2.0 + +# +# info: +# +# Dump information for one device +# +# +############################################################################## + + +### SET ### + +# use bash strict mode +set -euo pipefail + +### TRAPS ### + +# trap signals for clean exit +trap 'exit $?' EXIT +trap 'error_m interrupted!' SIGINT + +### CONSTANTS ### +readonly script_path="$(cd "$(dirname "$0")";pwd -P)" +readonly top="${script_path}/../../.." +readonly avbtool="${top}/external/avb/avbtool.py" + +## HELP MESSAGE (USAGE INFO) +# TODO + +### FUNCTIONS ### + +info() { + local source="${1}" + + local bootloader_version=$(cat ${source}/*.info.txt | grep "MBM Version:" | cut -c 14-) + local build_id=$(cat ${source}/*.info.txt | grep "Build Id:" | cut -c 11-) + local build_fingerprint=$(cat ${source}/*.info.txt | grep "Build Fingerprint:" | cut -c 20-) + local build_description=$(cat ${source}/*.info.txt | grep "Version when read from CPV:" | cut -c 29-) + local security_patch=$(python3 ${avbtool} info_image --image ${source}/vbmeta.img | grep "com.android.build.vendor.security_patch" | cut -c 54- | sed s/\'//g) + local rollback_index=$(python3 ${avbtool} info_image --image ${source}/vbmeta.img | grep "Rollback Index:" | cut -c 27-) + + echo "Bootloader version: $bootloader_version" + echo "Build ID: $build_id" + echo "Build fingerprint: $build_fingerprint" + echo "Build description: $build_description" + echo "Vendor security patch: $security_patch" + echo "AVB rollback index: $rollback_index" +} + +# error message +# ARG1: error message for STDERR +# ARG2: error status +error_m() { + echo "ERROR: ${1:-'failed.'}" 1>&2 + return "${2:-1}" +} + +# print help message. +help_message() { + echo "${help_message:-'No help available.'}" +} + +main() { + if [[ $# -eq 1 ]] ; then + info "${1}" + else + error_m + fi +} + +### RUN PROGRAM ### + +main "${@}" + + +## From 8380737c80fb3cd4b093284420310bba3ea6100e Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 1 Dec 2023 02:26:28 +0200 Subject: [PATCH 018/111] pixel: extract-utils firmware handling integration Change-Id: I1de8390eca70e775d54b840eba6aeb15f2f1ea61 --- pixel/device.sh | 14 +-- pixel/extract-factory-image.sh | 6 +- pixel/firmware.sh | 177 ---------------------------- pixel/prepare-firmware-makefiles.sh | 93 +++++++++++++++ pixel/prepare-firmware.sh | 102 ++++++++++++++++ 5 files changed, 204 insertions(+), 188 deletions(-) delete mode 100755 pixel/firmware.sh create mode 100755 pixel/prepare-firmware-makefiles.sh create mode 100755 pixel/prepare-firmware.sh diff --git a/pixel/device.sh b/pixel/device.sh index 378311fa..fcb40e98 100755 --- a/pixel/device.sh +++ b/pixel/device.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 The Calyx Institute +# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 @@ -49,20 +49,18 @@ device() { pushd "${top}" if [[ -f device/google/${device}/regen-vendor.sh ]]; then if [[ -z ${wifi_only-} ]]; then - device/google/${device}/regen-carriersettings.sh "${factory_dir}/image/product.img" device/google/${device}/proprietary-files-carriersettings.txt + device/google/${device}/regen-carriersettings.sh "${factory_dir}/product.img" device/google/${device}/proprietary-files-carriersettings.txt fi - device/google/${device}/regen-vendor.sh "${factory_dir}/image/vendor.img" device/google/${device}/proprietary-files-vendor.txt + device/google/${device}/regen-vendor.sh "${factory_dir}/vendor.img" device/google/${device}/proprietary-files-vendor.txt else if [[ -z ${wifi_only-} ]]; then - device/google/*/${device}/regen-carriersettings.sh "${factory_dir}/image/product.img" device/google/*/${device}/proprietary-files-carriersettings.txt + device/google/*/${device}/regen-carriersettings.sh "${factory_dir}/product.img" device/google/*/${device}/proprietary-files-carriersettings.txt fi - device/google/*/${device}/regen-vendor.sh "${factory_dir}/image/vendor.img" device/google/*/${device}/proprietary-files-vendor.txt + device/google/*/${device}/regen-vendor.sh "${factory_dir}/vendor.img" device/google/*/${device}/proprietary-files-vendor.txt fi - device/google/${device}/extract-files.sh "${factory_dir}/image" + device/google/${device}/extract-files.sh "${factory_dir}" popd - "${script_path}/firmware.sh" "${device}" - echo "${build_id}" > "${top}/vendor/google/${device}/build_id.txt" } diff --git a/pixel/extract-factory-image.sh b/pixel/extract-factory-image.sh index 275619f4..c1b22d7c 100755 --- a/pixel/extract-factory-image.sh +++ b/pixel/extract-factory-image.sh @@ -1,11 +1,11 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 The Calyx Institute +# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute # # SPDX-License-Identifier: Apache-2.0 # -# extract: +# extract-factory-image: # # Extract Pixel factory images # @@ -53,7 +53,7 @@ extract_factory_image() { pushd "${factory_dir}" unzip -o "${factory_zip}" pushd ${device}-${build_id,,} - unzip -o "image-${device}-${build_id,,}.zip" -d "image" + unzip -o "image-${device}-${build_id,,}.zip" popd popd } diff --git a/pixel/firmware.sh b/pixel/firmware.sh deleted file mode 100755 index b5f92922..00000000 --- a/pixel/firmware.sh +++ /dev/null @@ -1,177 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022 The Calyx Institute -# -# SPDX-License-Identifier: Apache-2.0 - -# -# extract: -# -# Setup pixel firmware -# -# -############################################################################## - - -### SET ### - -# use bash strict mode -set -euo pipefail - - -### TRAPS ### - -# trap signals for clean exit -trap 'exit $?' EXIT -trap 'error_m interrupted!' SIGINT - -### CONSTANTS ### -readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" -readonly top="${script_path}/../../.." - -readonly fbpacktool="${top}/calyx/scripts/fbpacktool/fbpacktool.py" -readonly qc_image_unpacker="${top}/prebuilts/extract-tools/linux-x86/bin/qc_image_unpacker" -readonly extract_ota_py="${top}/tools/extract-utils/extract_ota.py" - -readonly work_dir="${WORK_DIR:-/tmp/pixel}" - -source "${vars_path}/pixels" - -readonly device="${1}" -source "${vars_path}/${device}" - -readonly _wifi_only="${wifi_only:-false}" - -readonly factory_dir="${work_dir}/${device}/${build_id}/factory/${device}-${build_id,,}" -readonly ota_zip="${work_dir}/${device}/${build_id}/$(basename ${ota_url})" -readonly ota_firmware_dir="${work_dir}/${device}/${build_id}/firmware" - -readonly vendor_path="${top}/vendor/google/${device}" - -## HELP MESSAGE (USAGE INFO) -# TODO - -### FUNCTIONS ### - -# Firmware included in our factory images, -# typically bootloader and radio -copy_factory_firmware() { - cp "${factory_dir}"/bootloader-*.img "${vendor_path}/firmware/" - if [[ "${_wifi_only}" != "true" ]]; then - cp "${factory_dir}"/radio-*.img "${vendor_path}/firmware/" - fi - cp "${factory_dir}"/image/android-info.txt "${vendor_path}/android-info.txt" -} - -# Unpack the seperate partitions needed for OTA -# from the factory image's bootloader.img -unpack_firmware() { - local fbpk="${fbpk_version:-v1}" - - if [[ "${_wifi_only}" != "true" ]]; then - # modem.img - "${qc_image_unpacker}" -i "${factory_dir}"/radio-*.img -o "${ota_firmware_dir}" - # Alternative: dd bs=4 skip=35 - fi - - if [[ "$fbpk" == "v1" ]]; then - # All other ${firmware_partitions[@]} - "${qc_image_unpacker}" -i "${factory_dir}"/bootloader-*.img -o "${ota_firmware_dir}" - else - # All other ${firmware_partitions[@]} - python3 "${fbpacktool}" unpack -o "${ota_firmware_dir}" "${factory_dir}"/bootloader-*.img - fi -} - -extract_firmware() { - echo "${ota_sha256} ${ota_zip}" | sha256sum --check --status - python3 ${extract_ota_py} ${ota_zip} -o "${ota_firmware_dir}" -p ${firmware_partitions[@]} -} - -# Firmware included in OTAs, separate partitions -# Can be extracted from bootloader.img inside the factory image, -# or directly from the OTA zip -copy_ota_firmware() { - for fp in ${firmware_partitions[@]}; do - cp "${ota_firmware_dir}/${fp}.img" "${vendor_path}/firmware/${fp}.img" - done -} - -setup_makefiles() { - local exists=$(grep firmware "${vendor_path}/BoardConfigVendor.mk") - if [[ -z "${exists}" ]]; then - echo >> "${vendor_path}/BoardConfigVendor.mk" - echo "# firmware" >> "${vendor_path}/BoardConfigVendor.mk" - echo "TARGET_BOARD_INFO_FILE := vendor/google/${device}/android-info.txt" >> "${vendor_path}/BoardConfigVendor.mk" - echo >> "${vendor_path}/BoardConfigVendor.mk" - echo "AB_OTA_PARTITIONS += \\" >> "${vendor_path}/BoardConfigVendor.mk" - for fp in ${firmware_partitions[@]}; do - echo " ${fp} \\" >> "${vendor_path}/BoardConfigVendor.mk" - done - echo >> "${vendor_path}/BoardConfigVendor.mk" - fi - - local exists2=$(grep firmware "${vendor_path}/Android.mk") - if [[ -z "${exists2}" ]]; then - # I don't like this - sed -i /endif/d "${vendor_path}/Android.mk" - - local bootloader_version=$(cat "${vendor_path}/android-info.txt" | grep version-bootloader | cut -d = -f 2) - if [[ "${_wifi_only}" != "true" ]]; then - local radio_version=$(cat "${vendor_path}/android-info.txt" | grep version-baseband | cut -d = -f 2) - fi - - echo >> "${vendor_path}/Android.mk" - echo "# firmware" >> "${vendor_path}/Android.mk" - echo "\$(call add-radio-file,firmware/bootloader-${device}-${bootloader_version,,}.img,version-bootloader)" >> "${vendor_path}/Android.mk" - if [[ "${_wifi_only}" != "true" ]]; then - echo "\$(call add-radio-file,firmware/radio-${device}-${radio_version,,}.img,version-baseband)" >> "${vendor_path}/Android.mk" - fi - - for fp in ${firmware_partitions[@]}; do - echo "\$(call add-radio-file,firmware/${fp}.img)" >> "${vendor_path}/Android.mk" - done - echo >> "${vendor_path}/Android.mk" - - # I still don't like this - echo endif >> "${vendor_path}/Android.mk" - fi -} - -# error message -# ARG1: error message for STDERR -# ARG2: error status -error_m() { - echo "ERROR: ${1:-'failed.'}" 1>&2 - return "${2:-1}" -} - -# print help message. -help_message() { - echo "${help_message:-'No help available.'}" -} - -main() { - rm -rf "${ota_firmware_dir}" - mkdir -p "${ota_firmware_dir}" - rm -rf "${vendor_path}/firmware" - mkdir -p "${vendor_path}/firmware" - - copy_factory_firmware - # Not all devices need OTA, most are supported in image_unpacker - if [[ -n ${needs_ota-} ]]; then - extract_firmware - else - unpack_firmware - fi - copy_ota_firmware - setup_makefiles -} - -### RUN PROGRAM ### - -main "${@}" - - -## diff --git a/pixel/prepare-firmware-makefiles.sh b/pixel/prepare-firmware-makefiles.sh new file mode 100755 index 00000000..abaf36a5 --- /dev/null +++ b/pixel/prepare-firmware-makefiles.sh @@ -0,0 +1,93 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute +# +# SPDX-License-Identifier: Apache-2.0 + +# +# prepare-firmware-makefiles: +# +# Setup pixel makefiles for images used in factory images +# +# +############################################################################## + + +### SET ### + +# use bash strict mode +set -euo pipefail + + +### TRAPS ### + +# trap signals for clean exit +trap 'exit $?' EXIT +trap 'error_m interrupted!' SIGINT + +### CONSTANTS ### +readonly script_path="$(cd "$(dirname "$0")";pwd -P)" +readonly vars_path="${script_path}/../vars" +readonly top="${script_path}/../../.." + +readonly work_dir="${WORK_DIR:-/tmp/pixel}" + +source "${vars_path}/pixels" + +readonly device="${1}" +source "${vars_path}/${device}" + +readonly _wifi_only="${wifi_only:-false}" + +readonly vendor_path="${top}/vendor/google/${device}" + +## HELP MESSAGE (USAGE INFO) +# TODO + +### FUNCTIONS ### + +setup_makefiles() { + local androidmk="${2}" + local boardmk="${3}" + + printf '\n%s\n' "TARGET_BOARD_INFO_FILE := vendor/google/${device}/android-info.txt" >> "${boardmk}" + + local bootloader_version=$(cat "${vendor_path}/android-info.txt" | grep version-bootloader | cut -d = -f 2) + if [[ "${_wifi_only}" != "true" ]]; then + local radio_version=$(cat "${vendor_path}/android-info.txt" | grep version-baseband | cut -d = -f 2) + fi + + printf '\n%s\n' "\$(call add-radio-file,factory/bootloader-${device}-${bootloader_version,,}.img,version-bootloader)" >> "${androidmk}" + if [[ "${_wifi_only}" != "true" ]]; then + printf '%s\n' "\$(call add-radio-file,factory/radio-${device}-${radio_version,,}.img,version-baseband)" >> "${androidmk}" + fi + printf '\n' >> "${androidmk}" +} + +# error message +# ARG1: error message for STDERR +# ARG2: error status +error_m() { + echo "ERROR: ${1:-'failed.'}" 1>&2 + return "${2:-1}" +} + +# print help message. +help_message() { + echo "${help_message:-'No help available.'}" +} + +main() { + if [[ $# -eq 3 ]] ; then + setup_makefiles "${device}" "${2}" "${3}" + else + error_m + fi +} + +### RUN PROGRAM ### + +main "${@}" + + +## diff --git a/pixel/prepare-firmware.sh b/pixel/prepare-firmware.sh new file mode 100755 index 00000000..452b72c4 --- /dev/null +++ b/pixel/prepare-firmware.sh @@ -0,0 +1,102 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute +# +# SPDX-License-Identifier: Apache-2.0 + +# +# prepare-firmware: +# +# Pixel firmware preparation hook for extract-utils +# +# +############################################################################## + + +### SET ### + +# use bash strict mode +set -euo pipefail + + +### TRAPS ### + +# trap signals for clean exit +trap 'exit $?' EXIT +trap 'error_m interrupted!' SIGINT + +### CONSTANTS ### +readonly script_path="$(cd "$(dirname "$0")";pwd -P)" +readonly vars_path="${script_path}/../vars" +readonly top="${script_path}/../../.." + +readonly fbpacktool="${top}/calyx/scripts/fbpacktool/fbpacktool.py" +readonly qc_image_unpacker="${top}/prebuilts/extract-tools/linux-x86/bin/qc_image_unpacker" + +readonly device="${1}" +source "${vars_path}/${device}" + +readonly _fbpk_version="${fbpk_version:-v1}" +readonly _wifi_only="${wifi_only:-false}" + +readonly vendor_path="${top}/vendor/google/${device}" + +readonly src_dir="${2}" + +## HELP MESSAGE (USAGE INFO) +# TODO + +### FUNCTIONS ### + +# Firmware included in our factory images, +# typically bootloader and radio +copy_factory_firmware() { + cp "${src_dir}"/bootloader-*.img "${vendor_path}/factory/" + if [[ "${_wifi_only}" != "true" ]]; then + cp "${src_dir}"/radio-*.img "${vendor_path}/factory/" + fi + cp "${src_dir}"/android-info.txt "${vendor_path}/android-info.txt" +} + +# Unpack the seperate partitions needed for OTA +# from the factory image's bootloader.img & radio.img +unpack_firmware() { + if [[ "${_wifi_only}" != "true" ]]; then + "${qc_image_unpacker}" -i "${src_dir}"/radio-*.img -o "${src_dir}" + # Alternative: dd bs=4 skip=35 + fi + + if [[ "$_fbpk_version" == "v1" ]]; then + "${qc_image_unpacker}" -i "${src_dir}"/bootloader-*.img -o "${src_dir}" + else + python3 "${fbpacktool}" unpack -o "${src_dir}" "${src_dir}"/bootloader-*.img + fi +} + +# error message +# ARG1: error message for STDERR +# ARG2: error status +error_m() { + echo "ERROR: ${1:-'failed.'}" 1>&2 + return "${2:-1}" +} + +# print help message. +help_message() { + echo "${help_message:-'No help available.'}" +} + +main() { + rm -rf "${vendor_path}/factory" + mkdir -p "${vendor_path}/factory" + + copy_factory_firmware + unpack_firmware +} + +### RUN PROGRAM ### + +main "${@}" + + +## From 962d263d355339fc244dda9176b83a059d096384 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 4 Dec 2023 14:50:38 +0200 Subject: [PATCH 019/111] vars: Remove firmware_partitions These have been moved to device trees after extract-utils integration Change-Id: I40b7a11358aed0039da19d3f22987bd65720ac55 --- vars/barbet | 16 ---------------- vars/bluejay | 13 ------------- vars/blueline | 16 ---------------- vars/bonito | 16 ---------------- vars/bramble | 16 ---------------- vars/cheetah | 13 ------------- vars/coral | 15 --------------- vars/crosshatch | 16 ---------------- vars/felix | 13 ------------- vars/flame | 15 --------------- vars/husky | 15 --------------- vars/lynx | 13 ------------- vars/oriole | 13 ------------- vars/panther | 13 ------------- vars/raven | 13 ------------- vars/redfin | 16 ---------------- vars/sargo | 16 ---------------- vars/shiba | 15 --------------- vars/sunfish | 15 --------------- vars/tangorpro | 12 ------------ 20 files changed, 290 deletions(-) diff --git a/vars/barbet b/vars/barbet index a0d8a269..4d04af00 100644 --- a/vars/barbet +++ b/vars/barbet @@ -1,21 +1,5 @@ # Pixel 5a -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - devcfg - hyp - keymaster - qupfw - tz - uefisecapp - xbl - xbl_config - featenabler - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/redbull diff --git a/vars/bluejay b/vars/bluejay index 330a1012..b29d7f99 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -1,18 +1,5 @@ # Pixel 6a -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/bluejay diff --git a/vars/blueline b/vars/blueline index 07e1d712..a8136d33 100644 --- a/vars/blueline +++ b/vars/blueline @@ -1,21 +1,5 @@ # Pixel 3 -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - cmnlib - cmnlib64 - devcfg - hyp - keymaster - qupfw - tz - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in crosshatch diff --git a/vars/bonito b/vars/bonito index ad502707..b2d96200 100644 --- a/vars/bonito +++ b/vars/bonito @@ -1,21 +1,5 @@ # Pixel 3a XL -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - cmnlib - cmnlib64 - devcfg - hyp - keymaster - qupfw - tz - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/bonito diff --git a/vars/bramble b/vars/bramble index 1113dd41..4879add1 100644 --- a/vars/bramble +++ b/vars/bramble @@ -1,21 +1,5 @@ # Pixel 4a (5G) -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - devcfg - hyp - keymaster - qupfw - tz - uefisecapp - xbl - xbl_config - featenabler - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in barbet diff --git a/vars/cheetah b/vars/cheetah index 6ab96335..eb3e765b 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -1,18 +1,5 @@ # Pixel 7 Pro -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/gs201 diff --git a/vars/coral b/vars/coral index dd4c3e03..0981cdef 100644 --- a/vars/coral +++ b/vars/coral @@ -1,20 +1,5 @@ # Pixel 4 XL -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - devcfg - hyp - keymaster - qupfw - tz - uefisecapp - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/coral diff --git a/vars/crosshatch b/vars/crosshatch index ba7e3b76..b234bbfe 100644 --- a/vars/crosshatch +++ b/vars/crosshatch @@ -1,21 +1,5 @@ # Pixel 3 XL -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - cmnlib - cmnlib64 - devcfg - hyp - keymaster - qupfw - tz - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/crosshatch diff --git a/vars/felix b/vars/felix index 704dcab3..01a78075 100644 --- a/vars/felix +++ b/vars/felix @@ -1,18 +1,5 @@ # Pixel Fold -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/felix diff --git a/vars/flame b/vars/flame index c2c86208..c1b48d2a 100644 --- a/vars/flame +++ b/vars/flame @@ -1,20 +1,5 @@ # Pixel 4 -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - devcfg - hyp - keymaster - qupfw - tz - uefisecapp - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in coral diff --git a/vars/husky b/vars/husky index 1b7f56de..2a7b50d6 100644 --- a/vars/husky +++ b/vars/husky @@ -1,20 +1,5 @@ # Pixel 8 Pro -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gcf - gsa - gsa_bl1 - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/gs-common diff --git a/vars/lynx b/vars/lynx index 6d09a3a9..f8e8cebc 100644 --- a/vars/lynx +++ b/vars/lynx @@ -1,18 +1,5 @@ # Pixel 7a -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/lynx diff --git a/vars/oriole b/vars/oriole index ace343a1..d1b47502 100644 --- a/vars/oriole +++ b/vars/oriole @@ -1,18 +1,5 @@ # Pixel 6 -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in raven diff --git a/vars/panther b/vars/panther index bc2c0ead..0594a781 100644 --- a/vars/panther +++ b/vars/panther @@ -1,18 +1,5 @@ # Pixel 7 -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in cheetah diff --git a/vars/raven b/vars/raven index edfbdcb1..fdf3ef72 100644 --- a/vars/raven +++ b/vars/raven @@ -1,18 +1,5 @@ # Pixel 6 Pro -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/gs101 diff --git a/vars/redfin b/vars/redfin index 50ac3c16..c5965d39 100644 --- a/vars/redfin +++ b/vars/redfin @@ -1,21 +1,5 @@ # Pixel 5 -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - devcfg - hyp - keymaster - qupfw - tz - uefisecapp - xbl - xbl_config - featenabler - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in barbet diff --git a/vars/sargo b/vars/sargo index e70a8bce..8eab163f 100644 --- a/vars/sargo +++ b/vars/sargo @@ -1,21 +1,5 @@ # Pixel 3a -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - cmnlib - cmnlib64 - devcfg - hyp - keymaster - qupfw - tz - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in bonito diff --git a/vars/shiba b/vars/shiba index 77585976..fc6d11d8 100644 --- a/vars/shiba +++ b/vars/shiba @@ -1,20 +1,5 @@ # Pixel 8 -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gcf - gsa - gsa_bl1 - ldfw - modem -) - # Usage: ${device_repos[@]} device_repos=( # common repos in husky diff --git a/vars/sunfish b/vars/sunfish index 00c5a0c4..2c7c9243 100644 --- a/vars/sunfish +++ b/vars/sunfish @@ -1,20 +1,5 @@ # Pixel 4a -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - abl - aop - devcfg - hyp - keymaster - qupfw - tz - uefisecapp - xbl - xbl_config - modem -) - # Usage: ${device_repos[@]} device_repos=( device/google/sunfish diff --git a/vars/tangorpro b/vars/tangorpro index b238a783..77a61cad 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -1,17 +1,5 @@ # Pixel Tablet -# Usage: ${firmware_partitions[@]} -readonly firmware_partitions=( - bl1 - pbl - bl2 - abl - bl31 - tzsw - gsa - ldfw -) - # Usage: ${device_repos[@]} device_repos=( device/google/tangorpro From 4f9f724febf6ca7dde5922ed20f4c80d4c8bbc92 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 4 Jan 2024 00:55:53 +0530 Subject: [PATCH 020/111] January 2024 Security update Change-Id: I4501762ef8245e73d17e790802d720dd3007c712 --- vars/barbet | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 12 files changed, 115 insertions(+), 115 deletions(-) diff --git a/vars/barbet b/vars/barbet index 4d04af00..23342a74 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.014" +readonly build_id="UQ1A.240105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r13" -readonly aosp_tag="android-14.0.0_r16" +readonly prev_aosp_tag="android-14.0.0_r16" +readonly aosp_tag="android-14.0.0_r19" -readonly build_number="11049176" +readonly build_number="11129216" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-uq1a.231205.014-factory-0297d8d7.zip" -readonly image_sha256="0297d8d7eecc7a6180b5e54a3cd3014ff72fc181ba60eeec805e6d596467066d" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-uq1a.240105.002-factory-204a0106.zip" +readonly image_sha256="204a01061f3300b88066729324e6c53dcf8846db4ba5e225baf1f17fe88feca2" -readonly flash_url="https://flash.android.com/build/11049176?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11129216?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-uq1a.231205.014-27adb3f8.zip" -readonly ota_sha256="27adb3f8efc5ea37e5111b5bb1557ae7cac9749d5d1401f5a288c9ed24cb2e57" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-uq1a.240105.002-75a841be.zip" +readonly ota_sha256="75a841be3e2741cd6af9a00bd1d0ce86a11a28a12e2dd29ad641d069330a2d49" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/bluejay b/vars/bluejay index b29d7f99..1f04e146 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r19" -readonly build_number="11084887" +readonly build_number="11129216" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-uq1a.231205.015-factory-cc482de8.zip" -readonly image_sha256="cc482de897f03b877a003e02754dc1041a03e842548df50baa31a2f0b7dbfa8d" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-uq1a.240105.002-factory-d1dd7f0b.zip" +readonly image_sha256="d1dd7f0b3210c45b5b8ebe2d041dab6deb0d1f55a07c64e3d8e519e97178a8b8" -readonly flash_url="https://flash.android.com/build/11084887?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11129216?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-uq1a.231205.015-2503078c.zip" -readonly ota_sha256="2503078c241b1edb8df6a14481b8a7fc29792bc4b00c240336e334c335c5581e" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-uq1a.240105.002-6e3cf627.zip" +readonly ota_sha256="6e3cf627f60d1c005569196291ce7ed53fd2dd64872d623c160fc019eb9596c7" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/cheetah b/vars/cheetah index eb3e765b..091dea00 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r20" -readonly build_number="11084887" +readonly build_number="11206848" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-uq1a.231205.015-factory-99c57348.zip" -readonly image_sha256="99c573488bcff356696d3072d9d4c57cbf902df55cf723b57c4b2e3366d4809c" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-uq1a.240105.004-factory-9a3ab76d.zip" +readonly image_sha256="9a3ab76df39106de860630a83b9fbd633239559db237e705fa38c61bf5f227ee" -readonly flash_url="https://flash.android.com/build/11084887?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11206848?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-uq1a.231205.015-1811b943.zip" -readonly ota_sha256="1811b943337d5b50c3266d4bc8bf739c1c543b0e431e2f23fba8c9ac4d6a5ec2" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-uq1a.240105.004-6f97193f.zip" +readonly ota_sha256="6f97193f864babe20d70662021602f440c378d9b0343dc1b1c98095b7f3797ad" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/common b/vars/common index 8ac64dc3..8c1c2bee 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr1-release # Dec 2023 +readonly common_aosp_branch=android14-qpr1-release # Jan 2024 -readonly prev_common_aosp_tag=android-14.0.0_r14 # Nov 2023, Pixel 6 - 7a -readonly common_aosp_tag=android-14.0.0_r17 # Dec 2023, Pixel 6 - 8 +readonly prev_common_aosp_tag=android-14.0.0_r17 # Dec 2023, Pixel 6 - 8 +readonly common_aosp_tag=android-14.0.0_r20 # Jan 2024, Pixel 7 - 8 -readonly common_aosp_build_id=UQ1A.231205.015 # Dec 2023, Pixel 6 - 8 +readonly common_aosp_build_id=UQ1A.240105.004 # Jan 2024, Pixel 7 - 8 -readonly topic=dec23 +readonly topic=jan24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 01a78075..05a0bcf5 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r20" -readonly build_number="11084887" +readonly build_number="11206848" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-uq1a.231205.015-factory-7bf17efb.zip" -readonly image_sha256="7bf17efba4e53f81a6349fc93e535cde0c25cb8b190375600260c37ca0feb3e7" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-uq1a.240105.004-factory-43e2b4da.zip" +readonly image_sha256="43e2b4daf1f9a6e1f8dca86344cd5ee41025790d882a33aee66f7f34c0ec7eef" -readonly flash_url="https://flash.android.com/build/11084887?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11206848?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-uq1a.231205.015-128c9c6b.zip" -readonly ota_sha256="128c9c6bb2c52eb727e37a73b2f9cc0022ef66688dfb46443892b68ac27cfd3c" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-uq1a.240105.004-500583b0.zip" +readonly ota_sha256="500583b0dd089aed7a67d7a5cc641ef860696465ad84d8f621d43109fbfb2545" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/husky b/vars/husky index 2a7b50d6..0cf5ceec 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r12" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r20" -readonly build_number="11084887" +readonly build_number="11206848" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-uq1a.231205.015-factory-3cd41d9b.zip" -readonly image_sha256="3cd41d9b3138e1abece66c48e46c5218a1ee09cfb4c86c6c9b49f9cb18c5e102" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-uq1a.240105.004-factory-498499a8.zip" +readonly image_sha256="498499a85689c8813dd2454f849b3df4f1a9961624de935d74741996dc1924fb" -readonly flash_url="https://flash.android.com/build/11084887?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11206848?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-uq1a.231205.015-c52b44d3.zip" -readonly ota_sha256="c52b44d343081f59a0018e6749a0c220c314035d9e2be60a7bd93e86ef7543f6" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-uq1a.240105.004-dbd5246a.zip" +readonly ota_sha256="dbd5246acf6ebf97fa9575261b577df2a7590aee9d211f7b7960de17e21d1700" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/lynx b/vars/lynx index f8e8cebc..6cd86fe1 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r20" -readonly build_number="11084887" +readonly build_number="11206848" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-uq1a.231205.015-factory-f4fe5ddf.zip" -readonly image_sha256="f4fe5ddfc5dd50091a00a2f915d1519e2c73864e2482d69d182b757648b4c6f1" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-uq1a.240105.004-factory-2c92ba1c.zip" +readonly image_sha256="2c92ba1cf2cd6f3724481215f896bf60ad99fb1b2f519733e303d4bc1dbf3bc3" -readonly flash_url="https://flash.android.com/build/11084887?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11206848?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-uq1a.231205.015-94684930.zip" -readonly ota_sha256="94684930977f3de6d55f35fa1e98d8c2ce65682496dbaf2f311a0cdb209f762c" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-uq1a.240105.004-82d41b41.zip" +readonly ota_sha256="82d41b41663d63cde672535a1da8b9b7ec973e0d110758de156df2c6a22659e0" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/oriole b/vars/oriole index d1b47502..f8ad187a 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r19" -readonly build_number="11084887" +readonly build_number="11129216" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-uq1a.231205.015-factory-6a8ae3fb.zip" -readonly image_sha256="6a8ae3fba1cd573bc89caef2c012c70b169813dc808c1448ec4b0e71d0b7318b" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-uq1a.240105.002-factory-6efbb60f.zip" +readonly image_sha256="6efbb60fcf59dbcae1d9d59d7d2f00f70725e85087d127838366082a8d111cc5" -readonly flash_url="https://flash.android.com/build/11084887?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11129216?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-uq1a.231205.015-7729bb7e.zip" -readonly ota_sha256="7729bb7e4f9358178ca8b0457d4b0db5f78e2ec6b46d548d04c3f4fd864accd4" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-uq1a.240105.002-fea1befa.zip" +readonly ota_sha256="fea1befae89fdcda60d23b6463d93e232c6a4b2c18804e7116730dbd8344e4de" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/panther b/vars/panther index 0594a781..3a0a0b34 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r20" -readonly build_number="11084887" +readonly build_number="11206848" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-uq1a.231205.015-factory-9bc852a1.zip" -readonly image_sha256="9bc852a1f625b68361d18911d2fbfbb55cd6b229135adf4619c49c7d77ed3f08" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-uq1a.240105.004-factory-dbeec671.zip" +readonly image_sha256="dbeec67184b93b6537caadbeedafd5d5cbc885e2770eee0f49b4bb0754365af6" -readonly flash_url="https://flash.android.com/build/11084887?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11206848?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-uq1a.231205.015-b2ebb00d.zip" -readonly ota_sha256="b2ebb00d528079204265298aaecb0a51f8b46136942e7afd04f7e62c3034abf7" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-uq1a.240105.004-5082e782.zip" +readonly ota_sha256="5082e782a0e554c8335f09d197e80c7e74abf284c41daefaa2cd08a7cdf0b85d" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/raven b/vars/raven index fdf3ef72..b3f852a2 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r19" -readonly build_number="11084887" +readonly build_number="11129216" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-uq1a.231205.015-factory-4f0bf638.zip" -readonly image_sha256="4f0bf638939776d6189381a5bfaa882a9e62446b0f769c43097682a80b947698" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-uq1a.240105.002-factory-2bb682a7.zip" +readonly image_sha256="2bb682a7c5c0f94f090b24ddff44877b66898a6147aa65bfa3f7be0b7bec4e69" -readonly flash_url="https://flash.android.com/build/11084887?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11129216?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-uq1a.231205.015-36102566.zip" -readonly ota_sha256="3610256685106d847d92a437cf54ebc9263d938c0b8726a855b5665c865f0516" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-uq1a.240105.002-da2eb49a.zip" +readonly ota_sha256="da2eb49a247f002b56d83333ad5ab459323a22a2eb60caa64f7fc061cd32cfc2" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/shiba b/vars/shiba index fc6d11d8..f4336441 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r12" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r20" -readonly build_number="11084887" +readonly build_number="11206848" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-uq1a.231205.015-factory-ac56e72d.zip" -readonly image_sha256="ac56e72deba62082ee2dcc1dd9438ce3c6cfd2dfa2f5a6e74d61ac3e528dfe87" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-uq1a.240105.004-factory-9afb0b07.zip" +readonly image_sha256="9afb0b075fe67d4460602d2a7db60b742e3145e51e2e3902ff54f665b5ba5550" -readonly flash_url="https://flash.android.com/build/11084887?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11206848?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-uq1a.231205.015-4033cf00.zip" -readonly ota_sha256="4033cf0085e6a831758513a1c6cb9d9d40ef0357d968cae89fa554f8c869bc0d" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-uq1a.240105.004-bdf10181.zip" +readonly ota_sha256="bdf101819e964db2fcb51144001f16c8f77a41f15353decad8cbf8e9395196bf" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" diff --git a/vars/tangorpro b/vars/tangorpro index 77a61cad..c945b793 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.231205.015" +readonly build_id="UQ1A.240105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r14" -readonly aosp_tag="android-14.0.0_r17" +readonly prev_aosp_tag="android-14.0.0_r17" +readonly aosp_tag="android-14.0.0_r19" -readonly build_number="11084887" +readonly build_number="11129216" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-uq1a.231205.015-factory-90e76582.zip" -readonly image_sha256="90e7658230ae00ee6ce0dd741f1e2e80278b72984bb3774598a52e1152d49ae4" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-uq1a.240105.002-factory-628b08cd.zip" +readonly image_sha256="628b08cdf3e0f0086bb54aaeed5d749cfcc333291d2986eea3b28f3b09ad282a" -readonly flash_url="https://flash.android.com/build/11084887?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11129216?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-uq1a.231205.015-1b0c6e1e.zip" -readonly ota_sha256="1b0c6e1e97979f84416a1d1ce423731d1deebfb5c86b4499344b6fa5ac3e107a" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-uq1a.240105.002-ab6f538c.zip" +readonly ota_sha256="ab6f538ca2cea56fe466e053443b7e3a6fdcb62582f58aa41cc402fa3de783a4" -readonly security_patch="2023-12-05" +readonly security_patch="2024-01-05" From 97d2f05ad6dbdf8c0b68b4ff80469eac89c24859 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 6 Feb 2024 00:05:10 +0200 Subject: [PATCH 021/111] February 2024 Security update Change-Id: Icc4774077379e6bc9a363b800fa0b1ddca28d62b --- vars/barbet | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 12 files changed, 115 insertions(+), 115 deletions(-) diff --git a/vars/barbet b/vars/barbet index 23342a74..242a3450 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.002" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r16" -readonly aosp_tag="android-14.0.0_r19" +readonly prev_aosp_tag="android-14.0.0_r19" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11129216" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-uq1a.240105.002-factory-204a0106.zip" -readonly image_sha256="204a01061f3300b88066729324e6c53dcf8846db4ba5e225baf1f17fe88feca2" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-uq1a.240205.002-factory-47ba0232.zip" +readonly image_sha256="47ba02322ff666232a707728b7a65437d7218bd098e1e66c391299ef07f99c5a" -readonly flash_url="https://flash.android.com/build/11129216?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-uq1a.240105.002-75a841be.zip" -readonly ota_sha256="75a841be3e2741cd6af9a00bd1d0ce86a11a28a12e2dd29ad641d069330a2d49" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-uq1a.240205.002-0185ae5d.zip" +readonly ota_sha256="0185ae5dcd13a4f4f88e484287b4a121956cf34b5e3b5b95caec10333f87374d" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/bluejay b/vars/bluejay index 1f04e146..cb3cd8da 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.002" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r19" +readonly prev_aosp_tag="android-14.0.0_r19" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11129216" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-uq1a.240105.002-factory-d1dd7f0b.zip" -readonly image_sha256="d1dd7f0b3210c45b5b8ebe2d041dab6deb0d1f55a07c64e3d8e519e97178a8b8" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-uq1a.240205.002-factory-c6eba0d2.zip" +readonly image_sha256="c6eba0d2f6780666d3d103f6af8e1eabf95681e7c58c72f6337b7f265bf9b511" -readonly flash_url="https://flash.android.com/build/11129216?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-uq1a.240105.002-6e3cf627.zip" -readonly ota_sha256="6e3cf627f60d1c005569196291ce7ed53fd2dd64872d623c160fc019eb9596c7" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-uq1a.240205.002-3eb29a13.zip" +readonly ota_sha256="3eb29a13b4b1e9507b6e4074bf9325837de72bc1dd7fd45e84d5c4670a09e84d" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/cheetah b/vars/cheetah index 091dea00..5f15716a 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.004" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r20" +readonly prev_aosp_tag="android-14.0.0_r20" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11206848" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-uq1a.240105.004-factory-9a3ab76d.zip" -readonly image_sha256="9a3ab76df39106de860630a83b9fbd633239559db237e705fa38c61bf5f227ee" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-uq1a.240205.002-factory-2a7e9666.zip" +readonly image_sha256="2a7e9666afff6cdfc797a5f3525a9428b2a1e29ec0f56dae7d940777ff6362d6" -readonly flash_url="https://flash.android.com/build/11206848?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-uq1a.240105.004-6f97193f.zip" -readonly ota_sha256="6f97193f864babe20d70662021602f440c378d9b0343dc1b1c98095b7f3797ad" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-uq1a.240205.002-e8bd0fe0.zip" +readonly ota_sha256="e8bd0fe00c23cf77bf54c26ac6d7cf3c7f6ee6922d13d7d74da2716331cf5a57" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/common b/vars/common index 8c1c2bee..213ef116 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr1-release # Jan 2024 +readonly common_aosp_branch=android14-qpr1-release # Feb 2024 -readonly prev_common_aosp_tag=android-14.0.0_r17 # Dec 2023, Pixel 6 - 8 -readonly common_aosp_tag=android-14.0.0_r20 # Jan 2024, Pixel 7 - 8 +readonly prev_common_aosp_tag=android-14.0.0_r20 # Jan 2024, Pixel 7 - 8 +readonly common_aosp_tag=android-14.0.0_r25 # Feb 2024, Pixel 8 -readonly common_aosp_build_id=UQ1A.240105.004 # Jan 2024, Pixel 7 - 8 +readonly common_aosp_build_id=UQ1A.240205.004 # Feb 2024, Pixel 8 -readonly topic=jan24 +readonly topic=feb24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 05a0bcf5..92edbcac 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.004" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r20" +readonly prev_aosp_tag="android-14.0.0_r20" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11206848" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-uq1a.240105.004-factory-43e2b4da.zip" -readonly image_sha256="43e2b4daf1f9a6e1f8dca86344cd5ee41025790d882a33aee66f7f34c0ec7eef" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-uq1a.240205.002-factory-de97c59a.zip" +readonly image_sha256="de97c59a065caa7d00f2870b1ff0db351334d1b578f49fc66014c6aefcddc953" -readonly flash_url="https://flash.android.com/build/11206848?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-uq1a.240105.004-500583b0.zip" -readonly ota_sha256="500583b0dd089aed7a67d7a5cc641ef860696465ad84d8f621d43109fbfb2545" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-uq1a.240205.002-e63479fa.zip" +readonly ota_sha256="e63479fa4280f7cab223c5a9326a342635507529741e82dc3411558c71368807" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/husky b/vars/husky index 0cf5ceec..5b8a9396 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.004" +readonly build_id="UQ1A.240205.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r20" +readonly prev_aosp_tag="android-14.0.0_r20" +readonly aosp_tag="android-14.0.0_r25" -readonly build_number="11206848" +readonly build_number="11269751" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-uq1a.240105.004-factory-498499a8.zip" -readonly image_sha256="498499a85689c8813dd2454f849b3df4f1a9961624de935d74741996dc1924fb" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-uq1a.240205.004-factory-594e3ca4.zip" +readonly image_sha256="594e3ca49d445b04587bb78289dc726606d3d8878fb5cdfb39434f5714d15224" -readonly flash_url="https://flash.android.com/build/11206848?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11269751?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-uq1a.240105.004-dbd5246a.zip" -readonly ota_sha256="dbd5246acf6ebf97fa9575261b577df2a7590aee9d211f7b7960de17e21d1700" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-uq1a.240205.004-07ccb6c3.zip" +readonly ota_sha256="07ccb6c3cb4815d882e332d63eda0244820d587796eacb69ccf4ccd8ac9b2a5b" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/lynx b/vars/lynx index 6cd86fe1..b6b5ee10 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.004" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r20" +readonly prev_aosp_tag="android-14.0.0_r20" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11206848" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-uq1a.240105.004-factory-2c92ba1c.zip" -readonly image_sha256="2c92ba1cf2cd6f3724481215f896bf60ad99fb1b2f519733e303d4bc1dbf3bc3" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-uq1a.240205.002-factory-b7826107.zip" +readonly image_sha256="b78261072fde04777fd4687271c4e0bdfe75fa63d84fb00cc75bc2a33e08dee5" -readonly flash_url="https://flash.android.com/build/11206848?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-uq1a.240105.004-82d41b41.zip" -readonly ota_sha256="82d41b41663d63cde672535a1da8b9b7ec973e0d110758de156df2c6a22659e0" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-uq1a.240205.002-1e197bab.zip" +readonly ota_sha256="1e197bab937764e51d740895061a3c4ea2e0a3f69aa0198946c8d7542ed356d3" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/oriole b/vars/oriole index f8ad187a..e48cc8c5 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.002" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r19" +readonly prev_aosp_tag="android-14.0.0_r19" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11129216" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-uq1a.240105.002-factory-6efbb60f.zip" -readonly image_sha256="6efbb60fcf59dbcae1d9d59d7d2f00f70725e85087d127838366082a8d111cc5" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-uq1a.240205.002-factory-a50d172b.zip" +readonly image_sha256="a50d172b37c59f825c7954c02b9d64a1ff9263a5325e4b8e0316a5c0432ce931" -readonly flash_url="https://flash.android.com/build/11129216?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-uq1a.240105.002-fea1befa.zip" -readonly ota_sha256="fea1befae89fdcda60d23b6463d93e232c6a4b2c18804e7116730dbd8344e4de" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-uq1a.240205.002-b794fabd.zip" +readonly ota_sha256="b794fabd4d85f62868e0f3795b156e7b8ed054818d554b68da487ff82c59df6d" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/panther b/vars/panther index 3a0a0b34..993c064f 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.004" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r20" +readonly prev_aosp_tag="android-14.0.0_r20" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11206848" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-uq1a.240105.004-factory-dbeec671.zip" -readonly image_sha256="dbeec67184b93b6537caadbeedafd5d5cbc885e2770eee0f49b4bb0754365af6" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-uq1a.240205.002-factory-a5612ce9.zip" +readonly image_sha256="a5612ce96f6d6f615d56ce71ae25acdc32aeddd08bd0fc7b76c21f91aa8d26a4" -readonly flash_url="https://flash.android.com/build/11206848?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-uq1a.240105.004-5082e782.zip" -readonly ota_sha256="5082e782a0e554c8335f09d197e80c7e74abf284c41daefaa2cd08a7cdf0b85d" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-uq1a.240205.002-016d485b.zip" +readonly ota_sha256="016d485b0c3cbd123ee0aec4b33f776823a05033b0f9cc5fd4cb212c5299f165" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/raven b/vars/raven index b3f852a2..efdae1f1 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.002" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r19" +readonly prev_aosp_tag="android-14.0.0_r19" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11129216" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-uq1a.240105.002-factory-2bb682a7.zip" -readonly image_sha256="2bb682a7c5c0f94f090b24ddff44877b66898a6147aa65bfa3f7be0b7bec4e69" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-uq1a.240205.002-factory-8f1e502e.zip" +readonly image_sha256="8f1e502edba19bc25ccfb9acc9f6a561bb2e65e285efe9a8296e87195af30dc5" -readonly flash_url="https://flash.android.com/build/11129216?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-uq1a.240105.002-da2eb49a.zip" -readonly ota_sha256="da2eb49a247f002b56d83333ad5ab459323a22a2eb60caa64f7fc061cd32cfc2" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-uq1a.240205.002-ddb69a2f.zip" +readonly ota_sha256="ddb69a2f4628c84465d29ba6944c0edd56f9a3d1b7bda7a4eba1e02bd3388efe" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/shiba b/vars/shiba index f4336441..b10cf435 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.004" +readonly build_id="UQ1A.240205.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r20" +readonly prev_aosp_tag="android-14.0.0_r20" +readonly aosp_tag="android-14.0.0_r25" -readonly build_number="11206848" +readonly build_number="11269751" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-uq1a.240105.004-factory-9afb0b07.zip" -readonly image_sha256="9afb0b075fe67d4460602d2a7db60b742e3145e51e2e3902ff54f665b5ba5550" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-uq1a.240205.004-factory-5f3de3c0.zip" +readonly image_sha256="5f3de3c0ba9b5f209766ab376a56ffaad768bfaaa0e3b71bdbcdda9ef640c98e" -readonly flash_url="https://flash.android.com/build/11206848?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11269751?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-uq1a.240105.004-bdf10181.zip" -readonly ota_sha256="bdf101819e964db2fcb51144001f16c8f77a41f15353decad8cbf8e9395196bf" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-uq1a.240205.004-824ca3e4.zip" +readonly ota_sha256="824ca3e4ed66d0bd7336f29cb17f48f481ec2fc3f540b857d1872c3f16985159" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" diff --git a/vars/tangorpro b/vars/tangorpro index c945b793..fbfa669f 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240105.002" +readonly build_id="UQ1A.240205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr1-release" -readonly prev_aosp_tag="android-14.0.0_r17" -readonly aosp_tag="android-14.0.0_r19" +readonly prev_aosp_tag="android-14.0.0_r19" +readonly aosp_tag="android-14.0.0_r22" -readonly build_number="11129216" +readonly build_number="11224170" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-uq1a.240105.002-factory-628b08cd.zip" -readonly image_sha256="628b08cdf3e0f0086bb54aaeed5d749cfcc333291d2986eea3b28f3b09ad282a" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-uq1a.240205.002-factory-8608dd9d.zip" +readonly image_sha256="8608dd9ddda360eceb127b8fe79886fad8e14ef98c3ecc8a4c94c835e9d9f9ae" -readonly flash_url="https://flash.android.com/build/11129216?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11224170?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-uq1a.240105.002-ab6f538c.zip" -readonly ota_sha256="ab6f538ca2cea56fe466e053443b7e3a6fdcb62582f58aa41cc402fa3de783a4" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-uq1a.240205.002-a2b5cabd.zip" +readonly ota_sha256="a2b5cabd2ad4445590ffc46fe995d0e22db719d7adcbf6fc3efc4edcb31c6127" -readonly security_patch="2024-01-05" +readonly security_patch="2024-02-05" From 0c435108829dc1d54154dd21b001d77c3fcca4e2 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Feb 2024 02:26:44 +0530 Subject: [PATCH 022/111] redfin,bramble: UP1A.231105.001.B2, Feb 2024, r28 Change-Id: I3af9c974696b43fa3ad7b25dea0a94e7c9a8262b --- vars/bramble | 18 +++++++++--------- vars/redfin | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/vars/bramble b/vars/bramble index 4879add1..092fcc01 100644 --- a/vars/bramble +++ b/vars/bramble @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.001" +readonly build_id="UP1A.231105.001.B2" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r13" +readonly prev_aosp_tag="android-14.0.0_r13" +readonly aosp_tag="android-14.0.0_r28" -readonly build_number="10817346" +readonly build_number="11260668" -readonly image_url="https://dl.google.com/dl/android/aosp/bramble-up1a.231105.001-factory-98e180ca.zip" -readonly image_sha256="98e180caf107c721657624aebebfe5b179cb7f692221099c6a5905d5546f59ae" +readonly image_url="https://dl.google.com/dl/android/aosp/bramble-up1a.231105.001.b2-factory-46a218d9.zip" +readonly image_sha256="46a218d9dc2bf1802a584fa4e7e1b4d609a62189bd87a474201fb6d84e1c3e1c" -readonly flash_url="https://flash.android.com/build/10817346?target=bramble-user&signed" +readonly flash_url="https://flash.android.com/build/11260668?target=bramble-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-up1a.231105.001-db54d066.zip" -readonly ota_sha256="db54d0663e2fadd098b1c11e00e98a9e7acf7e66d46316ca7350d8be66c54894" +readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-up1a.231105.001.b2-06727ba9.zip" +readonly ota_sha256="06727ba9ba1d53b7c7ed3ae22eb5fada4af475ea5725a569d05774c753f32f48" readonly security_patch="2023-11-05" diff --git a/vars/redfin b/vars/redfin index c5965d39..d6292219 100644 --- a/vars/redfin +++ b/vars/redfin @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UP1A.231105.001" +readonly build_id="UP1A.231105.001.B2" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-release" -readonly prev_aosp_tag="android-14.0.0_r1" -readonly aosp_tag="android-14.0.0_r13" +readonly prev_aosp_tag="android-14.0.0_r13" +readonly aosp_tag="android-14.0.0_r28" -readonly build_number="10817346" +readonly build_number="11260668" -readonly image_url="https://dl.google.com/dl/android/aosp/redfin-up1a.231105.001-factory-4e32c252.zip" -readonly image_sha256="4e32c25205ac3969c75723b7b283d632cc1d209da4014aa8ee9e083110855475" +readonly image_url="https://dl.google.com/dl/android/aosp/redfin-up1a.231105.001.b2-factory-4e5a2679.zip" +readonly image_sha256="4e5a26793d8400f13b72cbd17aeb284e040b3236436f0c6f3119ccc77d4495ad" -readonly flash_url="https://flash.android.com/build/10817346?target=redfin-user&signed" +readonly flash_url="https://flash.android.com/build/11260668?target=redfin-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-up1a.231105.001-cb2967ff.zip" -readonly ota_sha256="cb2967ff065f205953b29e31ef9a598c7f35167d5ebabb5e79ee05efb05b5b9d" +readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-up1a.231105.001.b2-17322169.zip" +readonly ota_sha256="17322169afdc648e2e9ff46eee16156d5bdccd8842acb41b870b905cc28fe3b5" readonly security_patch="2023-11-05" From ad74c35eea16b53025a581975f933344f5519598 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 29 Feb 2024 03:22:53 +0530 Subject: [PATCH 023/111] vars: Add motos to "devices" Change-Id: I84cfa5097ad745c6c6cb773a27ff225467225057 --- vars/devices | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/devices b/vars/devices index 4d1f7cf0..683f39db 100644 --- a/vars/devices +++ b/vars/devices @@ -23,4 +23,7 @@ readonly devices=( blueline FP4 axolotl + devon + hawao + rhode ) From 32abe1fe4897c1a035df9f5d3ef53d37302e40a5 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 2 Mar 2024 02:23:59 +0530 Subject: [PATCH 024/111] vars: Add FP5 Change-Id: I507f5088f2c86fa684145ab55ba6cc5d22c6c272 --- vars/FP5 | 7 +++++++ vars/devices | 1 + vars/lineage_devices | 1 + 3 files changed, 9 insertions(+) create mode 100644 vars/FP5 diff --git a/vars/FP5 b/vars/FP5 new file mode 100644 index 00000000..863c5d56 --- /dev/null +++ b/vars/FP5 @@ -0,0 +1,7 @@ +# Fairphone 5 + +# Usage: ${device_repos[@]} +device_repos=( + device/fairphone/FP5 + kernel/fairphone/qcm6490 +) diff --git a/vars/devices b/vars/devices index 683f39db..cd521c70 100644 --- a/vars/devices +++ b/vars/devices @@ -21,6 +21,7 @@ readonly devices=( sargo crosshatch blueline + FP5 FP4 axolotl devon diff --git a/vars/lineage_devices b/vars/lineage_devices index 2cc2a38d..f3b1b941 100644 --- a/vars/lineage_devices +++ b/vars/lineage_devices @@ -1,6 +1,7 @@ # LineageOS supported devices (excluding Pixels) # Usage: ${lineage_devices[@]} readonly lineage_devices=( + FP5 FP4 axolotl devon From a7666d5c9b9a35da8371ced6f0163e8c5e777ce4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 5 Mar 2024 00:41:27 +0530 Subject: [PATCH 025/111] =?UTF-8?q?=F0=9F=90=98=20March=202024=20Quarterly?= =?UTF-8?q?=20Platform=20Release=20&=20Security=20update=20=F0=9F=90=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I56136ad2e9e33c500a1a469d2384e37ac3041ace --- vars/barbet | 22 +++++++++++----------- vars/bluejay | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/common | 10 +++++----- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- 12 files changed, 126 insertions(+), 126 deletions(-) diff --git a/vars/barbet b/vars/barbet index 242a3450..258d135a 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r19" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-uq1a.240205.002-factory-47ba0232.zip" -readonly image_sha256="47ba02322ff666232a707728b7a65437d7218bd098e1e66c391299ef07f99c5a" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240305.019.a1-factory-2bda2618.zip" +readonly image_sha256="2bda2618437e41744f88c19ae177050f941d4894d3456b40a4995dea90171dc0" -readonly flash_url="https://flash.android.com/build/11224170?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-uq1a.240205.002-0185ae5d.zip" -readonly ota_sha256="0185ae5dcd13a4f4f88e484287b4a121956cf34b5e3b5b95caec10333f87374d" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240305.019.a1-dc19d50f.zip" +readonly ota_sha256="dc19d50f4cb2f10c4e80d7bf10e1655eb8ecca41b4e63d32fb8294def224bfdc" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/bluejay b/vars/bluejay index cb3cd8da..494f5735 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r19" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-uq1a.240205.002-factory-c6eba0d2.zip" -readonly image_sha256="c6eba0d2f6780666d3d103f6af8e1eabf95681e7c58c72f6337b7f265bf9b511" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240305.019.a1-factory-60e97f8c.zip" +readonly image_sha256="60e97f8c300cd236dd7fd0ddba95173b0bf03a4ceb1c07e5fea1ded11257faf3" -readonly flash_url="https://flash.android.com/build/11224170?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-uq1a.240205.002-3eb29a13.zip" -readonly ota_sha256="3eb29a13b4b1e9507b6e4074bf9325837de72bc1dd7fd45e84d5c4670a09e84d" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240305.019.a1-fd58dc50.zip" +readonly ota_sha256="fd58dc50aa0ab8c992e211fd161fe1490938c952ea312b37f86a9d2eff2522c0" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/cheetah b/vars/cheetah index 5f15716a..75a781f6 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r20" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-uq1a.240205.002-factory-2a7e9666.zip" -readonly image_sha256="2a7e9666afff6cdfc797a5f3525a9428b2a1e29ec0f56dae7d940777ff6362d6" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240305.019.a1-factory-1c90a7b4.zip" +readonly image_sha256="1c90a7b44635208a9aaab4d53e1382304f584f92933ef556e8a7a279912242c0" -readonly flash_url="https://flash.android.com/build/11224170?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-uq1a.240205.002-e8bd0fe0.zip" -readonly ota_sha256="e8bd0fe00c23cf77bf54c26ac6d7cf3c7f6ee6922d13d7d74da2716331cf5a57" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240305.019.a1-fc692c4f.zip" +readonly ota_sha256="fc692c4f88fe35fcc62946429234b3d55e8c7b3de348fcc7979822acd96cad51" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/common b/vars/common index 213ef116..84c43aea 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr1-release # Feb 2024 +readonly common_aosp_branch=android14-qpr2-s1-release # Mar 2024 -readonly prev_common_aosp_tag=android-14.0.0_r20 # Jan 2024, Pixel 7 - 8 -readonly common_aosp_tag=android-14.0.0_r25 # Feb 2024, Pixel 8 +readonly prev_common_aosp_tag=android-14.0.0_r25 # Feb 2024, Pixel 8 +readonly common_aosp_tag=android-14.0.0_r29 # Mar 2024, Pixel 5a - 8 -readonly common_aosp_build_id=UQ1A.240205.004 # Feb 2024, Pixel 8 +readonly common_aosp_build_id=AP1A.240305.019.A1 # Mar 2024, Pixel 5a - 8 -readonly topic=feb24 +readonly topic=mar24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 92edbcac..b911eb20 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r20" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-uq1a.240205.002-factory-de97c59a.zip" -readonly image_sha256="de97c59a065caa7d00f2870b1ff0db351334d1b578f49fc66014c6aefcddc953" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240305.019.a1-factory-a6d25dca.zip" +readonly image_sha256="a6d25dcaefea66e1c392722855f3f62140e5f2753ce214ece3e9ef55232d8f87" -readonly flash_url="https://flash.android.com/build/11224170?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-uq1a.240205.002-e63479fa.zip" -readonly ota_sha256="e63479fa4280f7cab223c5a9326a342635507529741e82dc3411558c71368807" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240305.019.a1-f7c8e5ba.zip" +readonly ota_sha256="f7c8e5baa63eb320963ee07d75e1b6d9457f78bfaeb71d366d373f53f7f44666" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/husky b/vars/husky index 5b8a9396..fa09268f 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.004" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r20" -readonly aosp_tag="android-14.0.0_r25" +readonly prev_aosp_tag="android-14.0.0_r25" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11269751" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-uq1a.240205.004-factory-594e3ca4.zip" -readonly image_sha256="594e3ca49d445b04587bb78289dc726606d3d8878fb5cdfb39434f5714d15224" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240305.019.a1-factory-1091bcb2.zip" +readonly image_sha256="1091bcb2bfa130d53d225bd133b1ea2e3186683bb621785af61777a386aed6b0" -readonly flash_url="https://flash.android.com/build/11269751?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-uq1a.240205.004-07ccb6c3.zip" -readonly ota_sha256="07ccb6c3cb4815d882e332d63eda0244820d587796eacb69ccf4ccd8ac9b2a5b" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240305.019.a1-f1130be5.zip" +readonly ota_sha256="f1130be5f8ff4f2a2a8c9984d244b47898eaaea924ae9065a4f4ab1bed075442" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/lynx b/vars/lynx index b6b5ee10..961ea547 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r20" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-uq1a.240205.002-factory-b7826107.zip" -readonly image_sha256="b78261072fde04777fd4687271c4e0bdfe75fa63d84fb00cc75bc2a33e08dee5" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240305.019.a1-factory-7f7dfec6.zip" +readonly image_sha256="7f7dfec66260001381a4b039327a1658564f3384f805b34e9f4c68be912bbe72" -readonly flash_url="https://flash.android.com/build/11224170?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-uq1a.240205.002-1e197bab.zip" -readonly ota_sha256="1e197bab937764e51d740895061a3c4ea2e0a3f69aa0198946c8d7542ed356d3" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240305.019.a1-0127dde0.zip" +readonly ota_sha256="0127dde0f341cdc48be835d551ed545c41a5df1bf70104b1cf830e474240d57e" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/oriole b/vars/oriole index e48cc8c5..a271a3f9 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r19" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-uq1a.240205.002-factory-a50d172b.zip" -readonly image_sha256="a50d172b37c59f825c7954c02b9d64a1ff9263a5325e4b8e0316a5c0432ce931" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240305.019.a1-factory-0eee36d2.zip" +readonly image_sha256="0eee36d2b694758d00a85d999bafc67b050bb78b253dac2f2f14f9b491b90d5a" -readonly flash_url="https://flash.android.com/build/11224170?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-uq1a.240205.002-b794fabd.zip" -readonly ota_sha256="b794fabd4d85f62868e0f3795b156e7b8ed054818d554b68da487ff82c59df6d" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240305.019.a1-fdb8770a.zip" +readonly ota_sha256="fdb8770a11010b5d90bab4caa2a580ab4c5999ee8ea2d54d96eb6c2b6d58d7ca" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/panther b/vars/panther index 993c064f..f4306dd0 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r20" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-uq1a.240205.002-factory-a5612ce9.zip" -readonly image_sha256="a5612ce96f6d6f615d56ce71ae25acdc32aeddd08bd0fc7b76c21f91aa8d26a4" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240305.019.a1-factory-ae1ddec4.zip" +readonly image_sha256="ae1ddec4b4a3f6204d81d21f3742276d3b8df98bdc1a97466e73b41f2ca164bb" -readonly flash_url="https://flash.android.com/build/11224170?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-uq1a.240205.002-016d485b.zip" -readonly ota_sha256="016d485b0c3cbd123ee0aec4b33f776823a05033b0f9cc5fd4cb212c5299f165" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240305.019.a1-4eb706b7.zip" +readonly ota_sha256="4eb706b778472cf359882665a745de6ebeed1835be7ba24d49e6aac825c85639" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/raven b/vars/raven index efdae1f1..14138fe0 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r19" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-uq1a.240205.002-factory-8f1e502e.zip" -readonly image_sha256="8f1e502edba19bc25ccfb9acc9f6a561bb2e65e285efe9a8296e87195af30dc5" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240305.019.a1-factory-de202961.zip" +readonly image_sha256="de2029612d8531a111e5f4cb027cd24acacfe686a53f9f4b4c2524408c351115" -readonly flash_url="https://flash.android.com/build/11224170?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-uq1a.240205.002-ddb69a2f.zip" -readonly ota_sha256="ddb69a2f4628c84465d29ba6944c0edd56f9a3d1b7bda7a4eba1e02bd3388efe" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240305.019.a1-090960f8.zip" +readonly ota_sha256="090960f8b4618e3489f40d35c995351585c1b9787d58644b375e02a041ac29a2" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/shiba b/vars/shiba index b10cf435..5b7bd5c0 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.004" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r20" -readonly aosp_tag="android-14.0.0_r25" +readonly prev_aosp_tag="android-14.0.0_r25" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11269751" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-uq1a.240205.004-factory-5f3de3c0.zip" -readonly image_sha256="5f3de3c0ba9b5f209766ab376a56ffaad768bfaaa0e3b71bdbcdda9ef640c98e" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240305.019.a1-factory-41c6b5d5.zip" +readonly image_sha256="41c6b5d589c706b7d401b3702ba80f53afd397db9e33496dcef575bd1cd35114" -readonly flash_url="https://flash.android.com/build/11269751?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-uq1a.240205.004-824ca3e4.zip" -readonly ota_sha256="824ca3e4ed66d0bd7336f29cb17f48f481ec2fc3f540b857d1872c3f16985159" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240305.019.a1-a6dc4599.zip" +readonly ota_sha256="a6dc4599cb4242088d7c77348540107804788e7a9144b50845b753dd006ee065" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" diff --git a/vars/tangorpro b/vars/tangorpro index fbfa669f..94c9dc9f 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UQ1A.240205.002" +readonly build_id="AP1A.240305.019.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr1-release" +readonly aosp_branch="android14-qpr2-s1-release" -readonly prev_aosp_tag="android-14.0.0_r19" -readonly aosp_tag="android-14.0.0_r22" +readonly prev_aosp_tag="android-14.0.0_r22" +readonly aosp_tag="android-14.0.0_r29" -readonly build_number="11224170" +readonly build_number="11445699" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-uq1a.240205.002-factory-8608dd9d.zip" -readonly image_sha256="8608dd9ddda360eceb127b8fe79886fad8e14ef98c3ecc8a4c94c835e9d9f9ae" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240305.019.a1-factory-33122a5e.zip" +readonly image_sha256="33122a5e5131f8d0492aad7d326a94aefed184d2d4c62581edb1812745b9f856" -readonly flash_url="https://flash.android.com/build/11224170?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11445699?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-uq1a.240205.002-a2b5cabd.zip" -readonly ota_sha256="a2b5cabd2ad4445590ffc46fe995d0e22db719d7adcbf6fc3efc4edcb31c6127" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240305.019.a1-37ddba39.zip" +readonly ota_sha256="37ddba39c6d70d74746551e5ea4fc00b5a3c5e5a18f69dfb59ea7e0759b51695" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" From 66b6e2578cdf524fbe4a927d2a7057e6034abb61 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 6 Mar 2024 13:36:27 +0200 Subject: [PATCH 026/111] vars: Create aosp_target_release Change-Id: I96904064b5afbf30f9a65d195f1673493078a02d --- vars/aosp_target_release | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 vars/aosp_target_release diff --git a/vars/aosp_target_release b/vars/aosp_target_release new file mode 100644 index 00000000..e97c6129 --- /dev/null +++ b/vars/aosp_target_release @@ -0,0 +1,2 @@ +# Updated manually +aosp_target_release=ap1a From 107a9745d637f926e363520525a27e611bd16f6c Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 3 Apr 2024 03:46:04 +0530 Subject: [PATCH 027/111] April 2024 Security update Change-Id: I67c9580652c40d70bc1908f9cb98c6ea6a94c9b4 --- vars/barbet | 22 +++++++++++----------- vars/bluejay | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/common | 10 +++++----- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- 12 files changed, 126 insertions(+), 126 deletions(-) diff --git a/vars/barbet b/vars/barbet index 258d135a..d89d84c7 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240305.019.a1-factory-2bda2618.zip" -readonly image_sha256="2bda2618437e41744f88c19ae177050f941d4894d3456b40a4995dea90171dc0" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240405.002-factory-79849e07.zip" +readonly image_sha256="79849e074fcb87d3cb707d3b6aab26d04eb4078c859bf15f373fa5834a338a04" -readonly flash_url="https://flash.android.com/build/11445699?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240305.019.a1-dc19d50f.zip" -readonly ota_sha256="dc19d50f4cb2f10c4e80d7bf10e1655eb8ecca41b4e63d32fb8294def224bfdc" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240405.002-0865416f.zip" +readonly ota_sha256="0865416f44af26e3c2080054823c445bd44aca84f4306fc91741b43ceec8279e" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/bluejay b/vars/bluejay index 494f5735..0e32bb64 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240305.019.a1-factory-60e97f8c.zip" -readonly image_sha256="60e97f8c300cd236dd7fd0ddba95173b0bf03a4ceb1c07e5fea1ded11257faf3" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240405.002-factory-5132dfa4.zip" +readonly image_sha256="5132dfa47ab0dee84a770c71a2afb7c4234a798c735ab307634a2dc8f75aa5c9" -readonly flash_url="https://flash.android.com/build/11445699?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240305.019.a1-fd58dc50.zip" -readonly ota_sha256="fd58dc50aa0ab8c992e211fd161fe1490938c952ea312b37f86a9d2eff2522c0" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240405.002-6114363c.zip" +readonly ota_sha256="6114363cea4102798bd7d27f3ec59ed04f45eec1901ce0c5247777a0e7b5912c" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/cheetah b/vars/cheetah index 75a781f6..a71e5733 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240305.019.a1-factory-1c90a7b4.zip" -readonly image_sha256="1c90a7b44635208a9aaab4d53e1382304f584f92933ef556e8a7a279912242c0" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240405.002-factory-9def9997.zip" +readonly image_sha256="9def9997c45e76178c37bfc22ccd9b4ed8d15cd010af305f59df7e5c834ce12a" -readonly flash_url="https://flash.android.com/build/11445699?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240305.019.a1-fc692c4f.zip" -readonly ota_sha256="fc692c4f88fe35fcc62946429234b3d55e8c7b3de348fcc7979822acd96cad51" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240405.002-e690266f.zip" +readonly ota_sha256="e690266f6bbdbfd802b5708365568d53b2e30c6e21aecfb86a707f3ae5805a1c" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/common b/vars/common index 84c43aea..c5128998 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr2-s1-release # Mar 2024 +readonly common_aosp_branch=android14-qpr2-s2-release # Apr 2024 -readonly prev_common_aosp_tag=android-14.0.0_r25 # Feb 2024, Pixel 8 -readonly common_aosp_tag=android-14.0.0_r29 # Mar 2024, Pixel 5a - 8 +readonly prev_common_aosp_tag=android-14.0.0_r29 # Mar 2024, Pixel 5a - 8 +readonly common_aosp_tag=android-14.0.0_r31 # Apr 2024, Pixel Fold -readonly common_aosp_build_id=AP1A.240305.019.A1 # Mar 2024, Pixel 5a - 8 +readonly common_aosp_build_id=AP1A.240405.002.A1 # Apr 2024, Pixel Fold -readonly topic=mar24 +readonly topic=apr24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index b911eb20..dc1b3d28 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002.A1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-s2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r31" -readonly build_number="11445699" +readonly build_number="11583385" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240305.019.a1-factory-a6d25dca.zip" -readonly image_sha256="a6d25dcaefea66e1c392722855f3f62140e5f2753ce214ece3e9ef55232d8f87" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240405.002.a1-factory-6e108421.zip" +readonly image_sha256="6e108421d554799acc0796a875bf053a8e99b9ddfdb2e68b069b0196246b4d25" -readonly flash_url="https://flash.android.com/build/11445699?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11583385?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240305.019.a1-f7c8e5ba.zip" -readonly ota_sha256="f7c8e5baa63eb320963ee07d75e1b6d9457f78bfaeb71d366d373f53f7f44666" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240405.002.a1-6f4658f5.zip" +readonly ota_sha256="6f4658f55493ede530444b7fecb6b7ec143da8174e283c5cf601852d761ef779" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/husky b/vars/husky index fa09268f..ff0b08eb 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r25" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240305.019.a1-factory-1091bcb2.zip" -readonly image_sha256="1091bcb2bfa130d53d225bd133b1ea2e3186683bb621785af61777a386aed6b0" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240405.002-factory-e2ea86d4.zip" +readonly image_sha256="e2ea86d45a89e38e0f5e7b638896b63636beac40173d743622951abd53e15dad" -readonly flash_url="https://flash.android.com/build/11445699?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240305.019.a1-f1130be5.zip" -readonly ota_sha256="f1130be5f8ff4f2a2a8c9984d244b47898eaaea924ae9065a4f4ab1bed075442" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240405.002-2c9cdda5.zip" +readonly ota_sha256="2c9cdda587b42d6e3bcac32feb4d0afd2ebd143a10511d5c3649c0b6240e31a2" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/lynx b/vars/lynx index 961ea547..d27b1a82 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240305.019.a1-factory-7f7dfec6.zip" -readonly image_sha256="7f7dfec66260001381a4b039327a1658564f3384f805b34e9f4c68be912bbe72" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240405.002-factory-e7fe1bdf.zip" +readonly image_sha256="e7fe1bdf04fb049d1fdc5425e751dc89106b931a212134243a8ffb59c36b386d" -readonly flash_url="https://flash.android.com/build/11445699?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240305.019.a1-0127dde0.zip" -readonly ota_sha256="0127dde0f341cdc48be835d551ed545c41a5df1bf70104b1cf830e474240d57e" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240405.002-934b655b.zip" +readonly ota_sha256="934b655b87036f2aa6c7edf0d8769be9b9ffd1d659f97b0c17ea14da9ff0b72e" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/oriole b/vars/oriole index a271a3f9..9b1459fa 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240305.019.a1-factory-0eee36d2.zip" -readonly image_sha256="0eee36d2b694758d00a85d999bafc67b050bb78b253dac2f2f14f9b491b90d5a" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240405.002-factory-537b4123.zip" +readonly image_sha256="537b41232421841af442cd819911bfbae6cc3ed99b25289b713f1668f27c23af" -readonly flash_url="https://flash.android.com/build/11445699?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240305.019.a1-fdb8770a.zip" -readonly ota_sha256="fdb8770a11010b5d90bab4caa2a580ab4c5999ee8ea2d54d96eb6c2b6d58d7ca" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240405.002-bee2137c.zip" +readonly ota_sha256="bee2137c171e42a703c45215e1fbe991610b043b5fea35e31d66750f7d53f1fd" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/panther b/vars/panther index f4306dd0..824cef58 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240305.019.a1-factory-ae1ddec4.zip" -readonly image_sha256="ae1ddec4b4a3f6204d81d21f3742276d3b8df98bdc1a97466e73b41f2ca164bb" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240405.002-factory-d2396073.zip" +readonly image_sha256="d2396073823fec55c7aba44ba20c9ee9d83f5138be35a6ed45803772ecdb87d4" -readonly flash_url="https://flash.android.com/build/11445699?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240305.019.a1-4eb706b7.zip" -readonly ota_sha256="4eb706b778472cf359882665a745de6ebeed1835be7ba24d49e6aac825c85639" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240405.002-06b07234.zip" +readonly ota_sha256="06b072341c6d1c8c1f9179e553afc13333396637ab329947a93a2594be881470" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/raven b/vars/raven index 14138fe0..d180c91e 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240305.019.a1-factory-de202961.zip" -readonly image_sha256="de2029612d8531a111e5f4cb027cd24acacfe686a53f9f4b4c2524408c351115" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240405.002-factory-877e050e.zip" +readonly image_sha256="877e050e15199667e97d7a07a42646f7871858b7a46d13db8dfcb74d06b419c8" -readonly flash_url="https://flash.android.com/build/11445699?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240305.019.a1-090960f8.zip" -readonly ota_sha256="090960f8b4618e3489f40d35c995351585c1b9787d58644b375e02a041ac29a2" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240405.002-4e278e46.zip" +readonly ota_sha256="4e278e46897fe3e2439ab7496d2cdf1c6308221c33f2b63c254c085be5d7d2e4" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/shiba b/vars/shiba index 5b7bd5c0..e0321f99 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r25" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240305.019.a1-factory-41c6b5d5.zip" -readonly image_sha256="41c6b5d589c706b7d401b3702ba80f53afd397db9e33496dcef575bd1cd35114" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240405.002-factory-ed0ea957.zip" +readonly image_sha256="ed0ea9571c072e10e0d9f2745309e90626c83eb9ab94c81c7e6f23b93348f4da" -readonly flash_url="https://flash.android.com/build/11445699?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240305.019.a1-a6dc4599.zip" -readonly ota_sha256="a6dc4599cb4242088d7c77348540107804788e7a9144b50845b753dd006ee065" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240405.002-89147563.zip" +readonly ota_sha256="891475630f0fef0166f5afccb29b5fbec36fd10ccec88a2a753cf8c50aa19f75" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" diff --git a/vars/tangorpro b/vars/tangorpro index 94c9dc9f..7448cf84 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240305.019.A1" +readonly build_id="AP1A.240405.002" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s1-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r22" -readonly aosp_tag="android-14.0.0_r29" +readonly prev_aosp_tag="android-14.0.0_r29" +readonly aosp_tag="android-14.0.0_r30" -readonly build_number="11445699" +readonly build_number="11480754" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240305.019.a1-factory-33122a5e.zip" -readonly image_sha256="33122a5e5131f8d0492aad7d326a94aefed184d2d4c62581edb1812745b9f856" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240405.002-factory-1ffdd4b2.zip" +readonly image_sha256="1ffdd4b2dbf0fa9848da9377a2615a83e5404d75c3470cd5ed5aada91314b8ab" -readonly flash_url="https://flash.android.com/build/11445699?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11480754?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240305.019.a1-37ddba39.zip" -readonly ota_sha256="37ddba39c6d70d74746551e5ea4fc00b5a3c5e5a18f69dfb59ea7e0759b51695" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240405.002-210fffed.zip" +readonly ota_sha256="210fffed45691aac7ad6a0bf2c8856c212e6c8bad8dbd9d7ac6c81cd56365aad" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" From bfb5e3b2013e224ee8c4cd66cfec1ef3151143b1 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 4 Apr 2024 20:33:28 +0530 Subject: [PATCH 028/111] Check in factory image scripts from 5.6.0 * For easy reference * Unzipped from the actual prod factory images Change-Id: Ib984c405cc32754c8967f209401eec135c104b56 --- factory/FP4/flash-all.bat | 73 ++++++++++++++++++++++++++++ factory/FP4/flash-all.sh | 76 +++++++++++++++++++++++++++++ factory/FP4/flash-base.sh | 76 +++++++++++++++++++++++++++++ factory/FP5/flash-all.bat | 81 +++++++++++++++++++++++++++++++ factory/FP5/flash-all.sh | 84 +++++++++++++++++++++++++++++++++ factory/FP5/flash-base.sh | 81 +++++++++++++++++++++++++++++++ factory/axolotl/flash-all.bat | 66 ++++++++++++++++++++++++++ factory/axolotl/flash-all.sh | 69 +++++++++++++++++++++++++++ factory/axolotl/flash-base.sh | 66 ++++++++++++++++++++++++++ factory/barbet/flash-all.bat | 39 +++++++++++++++ factory/barbet/flash-all.sh | 42 +++++++++++++++++ factory/barbet/flash-base.sh | 39 +++++++++++++++ factory/bluejay/flash-all.bat | 39 +++++++++++++++ factory/bluejay/flash-all.sh | 42 +++++++++++++++++ factory/bluejay/flash-base.sh | 39 +++++++++++++++ factory/bramble/flash-all.bat | 39 +++++++++++++++ factory/bramble/flash-all.sh | 42 +++++++++++++++++ factory/bramble/flash-base.sh | 39 +++++++++++++++ factory/cheetah/flash-all.bat | 39 +++++++++++++++ factory/cheetah/flash-all.sh | 42 +++++++++++++++++ factory/cheetah/flash-base.sh | 39 +++++++++++++++ factory/coral/flash-all.bat | 39 +++++++++++++++ factory/coral/flash-all.sh | 42 +++++++++++++++++ factory/coral/flash-base.sh | 39 +++++++++++++++ factory/devon/flash-all.bat | 76 +++++++++++++++++++++++++++++ factory/devon/flash-all.sh | 79 +++++++++++++++++++++++++++++++ factory/devon/flash-base.sh | 76 +++++++++++++++++++++++++++++ factory/felix/flash-all.bat | 39 +++++++++++++++ factory/felix/flash-all.sh | 42 +++++++++++++++++ factory/felix/flash-base.sh | 39 +++++++++++++++ factory/flame/flash-all.bat | 39 +++++++++++++++ factory/flame/flash-all.sh | 42 +++++++++++++++++ factory/flame/flash-base.sh | 39 +++++++++++++++ factory/hawao/flash-all.bat | 76 +++++++++++++++++++++++++++++ factory/hawao/flash-all.sh | 79 +++++++++++++++++++++++++++++++ factory/hawao/flash-base.sh | 76 +++++++++++++++++++++++++++++ factory/husky/flash-all.bat | 39 +++++++++++++++ factory/husky/flash-all.sh | 42 +++++++++++++++++ factory/husky/flash-base.sh | 39 +++++++++++++++ factory/lynx/flash-all.bat | 39 +++++++++++++++ factory/lynx/flash-all.sh | 42 +++++++++++++++++ factory/lynx/flash-base.sh | 39 +++++++++++++++ factory/oriole/flash-all.bat | 39 +++++++++++++++ factory/oriole/flash-all.sh | 42 +++++++++++++++++ factory/oriole/flash-base.sh | 39 +++++++++++++++ factory/panther/flash-all.bat | 39 +++++++++++++++ factory/panther/flash-all.sh | 42 +++++++++++++++++ factory/panther/flash-base.sh | 39 +++++++++++++++ factory/raven/flash-all.bat | 39 +++++++++++++++ factory/raven/flash-all.sh | 42 +++++++++++++++++ factory/raven/flash-base.sh | 39 +++++++++++++++ factory/redfin/flash-all.bat | 39 +++++++++++++++ factory/redfin/flash-all.sh | 42 +++++++++++++++++ factory/redfin/flash-base.sh | 39 +++++++++++++++ factory/rhode/flash-all.bat | 76 +++++++++++++++++++++++++++++ factory/rhode/flash-all.sh | 79 +++++++++++++++++++++++++++++++ factory/rhode/flash-base.sh | 76 +++++++++++++++++++++++++++++ factory/shiba/flash-all.bat | 39 +++++++++++++++ factory/shiba/flash-all.sh | 42 +++++++++++++++++ factory/shiba/flash-base.sh | 39 +++++++++++++++ factory/sunfish/flash-all.bat | 39 +++++++++++++++ factory/sunfish/flash-all.sh | 42 +++++++++++++++++ factory/sunfish/flash-base.sh | 39 +++++++++++++++ factory/tangorpro/flash-all.bat | 33 +++++++++++++ factory/tangorpro/flash-all.sh | 36 ++++++++++++++ factory/tangorpro/flash-base.sh | 33 +++++++++++++ 66 files changed, 3267 insertions(+) create mode 100644 factory/FP4/flash-all.bat create mode 100755 factory/FP4/flash-all.sh create mode 100755 factory/FP4/flash-base.sh create mode 100644 factory/FP5/flash-all.bat create mode 100755 factory/FP5/flash-all.sh create mode 100755 factory/FP5/flash-base.sh create mode 100644 factory/axolotl/flash-all.bat create mode 100755 factory/axolotl/flash-all.sh create mode 100755 factory/axolotl/flash-base.sh create mode 100644 factory/barbet/flash-all.bat create mode 100755 factory/barbet/flash-all.sh create mode 100755 factory/barbet/flash-base.sh create mode 100644 factory/bluejay/flash-all.bat create mode 100755 factory/bluejay/flash-all.sh create mode 100755 factory/bluejay/flash-base.sh create mode 100644 factory/bramble/flash-all.bat create mode 100755 factory/bramble/flash-all.sh create mode 100755 factory/bramble/flash-base.sh create mode 100644 factory/cheetah/flash-all.bat create mode 100755 factory/cheetah/flash-all.sh create mode 100755 factory/cheetah/flash-base.sh create mode 100644 factory/coral/flash-all.bat create mode 100755 factory/coral/flash-all.sh create mode 100755 factory/coral/flash-base.sh create mode 100644 factory/devon/flash-all.bat create mode 100755 factory/devon/flash-all.sh create mode 100755 factory/devon/flash-base.sh create mode 100644 factory/felix/flash-all.bat create mode 100755 factory/felix/flash-all.sh create mode 100755 factory/felix/flash-base.sh create mode 100644 factory/flame/flash-all.bat create mode 100755 factory/flame/flash-all.sh create mode 100755 factory/flame/flash-base.sh create mode 100644 factory/hawao/flash-all.bat create mode 100755 factory/hawao/flash-all.sh create mode 100755 factory/hawao/flash-base.sh create mode 100644 factory/husky/flash-all.bat create mode 100755 factory/husky/flash-all.sh create mode 100755 factory/husky/flash-base.sh create mode 100644 factory/lynx/flash-all.bat create mode 100755 factory/lynx/flash-all.sh create mode 100755 factory/lynx/flash-base.sh create mode 100644 factory/oriole/flash-all.bat create mode 100755 factory/oriole/flash-all.sh create mode 100755 factory/oriole/flash-base.sh create mode 100644 factory/panther/flash-all.bat create mode 100755 factory/panther/flash-all.sh create mode 100755 factory/panther/flash-base.sh create mode 100644 factory/raven/flash-all.bat create mode 100755 factory/raven/flash-all.sh create mode 100755 factory/raven/flash-base.sh create mode 100644 factory/redfin/flash-all.bat create mode 100755 factory/redfin/flash-all.sh create mode 100755 factory/redfin/flash-base.sh create mode 100644 factory/rhode/flash-all.bat create mode 100755 factory/rhode/flash-all.sh create mode 100755 factory/rhode/flash-base.sh create mode 100644 factory/shiba/flash-all.bat create mode 100755 factory/shiba/flash-all.sh create mode 100755 factory/shiba/flash-base.sh create mode 100644 factory/sunfish/flash-all.bat create mode 100755 factory/sunfish/flash-all.sh create mode 100755 factory/sunfish/flash-base.sh create mode 100644 factory/tangorpro/flash-all.bat create mode 100755 factory/tangorpro/flash-all.sh create mode 100755 factory/tangorpro/flash-base.sh diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat new file mode 100644 index 00000000..62f95cff --- /dev/null +++ b/factory/FP4/flash-all.bat @@ -0,0 +1,73 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || exit /B 1 +fastboot flash abl_a abl.img || ( echo WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device! && exit /B 1 ) +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash core_nhlos_a core_nhlos.img +fastboot flash core_nhlos_b core_nhlos.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash featenabler_a featenabler.img +fastboot flash featenabler_b featenabler.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash imagefv_a imagefv.img +fastboot flash imagefv_b imagefv.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash multiimgoem_a multiimgoem.img +fastboot flash multiimgoem_b multiimgoem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash frp frp.img +fastboot flash devinfo devinfo.img + +fastboot erase misc +fastboot erase modemst1 +fastboot erase modemst2 + +fastboot --set-active=a + +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-FP4-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh new file mode 100755 index 00000000..32a392fc --- /dev/null +++ b/factory/FP4/flash-all.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: FP4$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash core_nhlos_a core_nhlos.img +fastboot flash core_nhlos_b core_nhlos.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash featenabler_a featenabler.img +fastboot flash featenabler_b featenabler.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash imagefv_a imagefv.img +fastboot flash imagefv_b imagefv.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash multiimgoem_a multiimgoem.img +fastboot flash multiimgoem_b multiimgoem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash frp frp.img +fastboot flash devinfo devinfo.img + +fastboot erase misc +fastboot erase modemst1 +fastboot erase modemst2 + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-FP4-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/FP4/flash-base.sh b/factory/FP4/flash-base.sh new file mode 100755 index 00000000..bc136b15 --- /dev/null +++ b/factory/FP4/flash-base.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: FP4$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash core_nhlos_a core_nhlos.img +fastboot flash core_nhlos_b core_nhlos.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash featenabler_a featenabler.img +fastboot flash featenabler_b featenabler.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash imagefv_a imagefv.img +fastboot flash imagefv_b imagefv.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash multiimgoem_a multiimgoem.img +fastboot flash multiimgoem_b multiimgoem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash userdata userdata.img +fastboot flash metadata metadata.img + +fastboot flash frp frp.img +fastboot flash devinfo devinfo.img + +fastboot erase misc +fastboot erase modemst1 +fastboot erase modemst2 + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/FP5/flash-all.bat b/factory/FP5/flash-all.bat new file mode 100644 index 00000000..a5a419a2 --- /dev/null +++ b/factory/FP5/flash-all.bat @@ -0,0 +1,81 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || exit /B 1 +fastboot flash abl_a abl.img || ( echo WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device! && exit /B 1 ) +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash cpucp_a cpucp.img +fastboot flash cpucp_b cpucp.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash featenabler_a featenabler.img +fastboot flash featenabler_b featenabler.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash imagefv_a imagefv.img +fastboot flash imagefv_b imagefv.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash multiimgoem_a multiimgoem.img +fastboot flash multiimgoem_b multiimgoem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash shrm_a shrm.img +fastboot flash shrm_b shrm.img +fastboot flash studybk_a studybk.img +fastboot flash studybk_b studybk.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash apdp apdp.img +fastboot flash ddr ddr.img +fastboot flash logfs logfs.img +fastboot flash rtice rtice.img +fastboot flash storsec storsec.img +fastboot flash study study.img + +fastboot flash frp frp.img + +fastboot erase misc + +fastboot --set-active=a + +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-FP5-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh new file mode 100755 index 00000000..015b4d75 --- /dev/null +++ b/factory/FP5/flash-all.sh @@ -0,0 +1,84 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: FP5$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash cpucp_a cpucp.img +fastboot flash cpucp_b cpucp.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash featenabler_a featenabler.img +fastboot flash featenabler_b featenabler.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash imagefv_a imagefv.img +fastboot flash imagefv_b imagefv.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash multiimgoem_a multiimgoem.img +fastboot flash multiimgoem_b multiimgoem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash shrm_a shrm.img +fastboot flash shrm_b shrm.img +fastboot flash studybk_a studybk.img +fastboot flash studybk_b studybk.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash apdp apdp.img +fastboot flash ddr ddr.img +fastboot flash logfs logfs.img +fastboot flash rtice rtice.img +fastboot flash storsec storsec.img +fastboot flash study study.img + +fastboot flash frp frp.img + +fastboot erase misc + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-FP5-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/FP5/flash-base.sh b/factory/FP5/flash-base.sh new file mode 100755 index 00000000..71fd2b26 --- /dev/null +++ b/factory/FP5/flash-base.sh @@ -0,0 +1,81 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: FP5$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash cpucp_a cpucp.img +fastboot flash cpucp_b cpucp.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash featenabler_a featenabler.img +fastboot flash featenabler_b featenabler.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash imagefv_a imagefv.img +fastboot flash imagefv_b imagefv.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash multiimgoem_a multiimgoem.img +fastboot flash multiimgoem_b multiimgoem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash shrm_a shrm.img +fastboot flash shrm_b shrm.img +fastboot flash studybk_a studybk.img +fastboot flash studybk_b studybk.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash apdp apdp.img +fastboot flash ddr ddr.img +fastboot flash logfs logfs.img +fastboot flash rtice rtice.img +fastboot flash storsec storsec.img +fastboot flash study study.img + +fastboot flash frp frp.img + +fastboot erase misc + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/axolotl/flash-all.bat b/factory/axolotl/flash-all.bat new file mode 100644 index 00000000..f9826298 --- /dev/null +++ b/factory/axolotl/flash-all.bat @@ -0,0 +1,66 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: sdm845" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: sdm845" || exit /B 1 +fastboot flash ImageFv_a ImageFv.img +fastboot flash ImageFv_b ImageFv.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash cmnlib_a cmnlib.img +fastboot flash cmnlib_b cmnlib.img +fastboot flash cmnlib64_a cmnlib64.img +fastboot flash cmnlib64_b cmnlib64.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash frp frp.img +fastboot flash devinfo devinfo.bin + +fastboot --set-active=a + +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/axolotl/flash-all.sh b/factory/axolotl/flash-all.sh new file mode 100755 index 00000000..bc368f03 --- /dev/null +++ b/factory/axolotl/flash-all.sh @@ -0,0 +1,69 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: sdm845$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash ImageFv_a ImageFv.img +fastboot flash ImageFv_b ImageFv.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash cmnlib_a cmnlib.img +fastboot flash cmnlib_b cmnlib.img +fastboot flash cmnlib64_a cmnlib64.img +fastboot flash cmnlib64_b cmnlib64.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash frp frp.img +fastboot flash devinfo devinfo.bin + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/axolotl/flash-base.sh b/factory/axolotl/flash-base.sh new file mode 100755 index 00000000..de49d478 --- /dev/null +++ b/factory/axolotl/flash-base.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: sdm845$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash ImageFv_a ImageFv.img +fastboot flash ImageFv_b ImageFv.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash aop_a aop.img +fastboot flash aop_b aop.img +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash cmnlib_a cmnlib.img +fastboot flash cmnlib_b cmnlib.img +fastboot flash cmnlib64_a cmnlib64.img +fastboot flash cmnlib64_b cmnlib64.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img + +fastboot flash frp frp.img +fastboot flash devinfo devinfo.bin + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key diff --git a/factory/barbet/flash-all.bat b/factory/barbet/flash-all.bat new file mode 100644 index 00000000..207376cc --- /dev/null +++ b/factory/barbet/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: barbet" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: barbet" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-barbet-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh new file mode 100755 index 00000000..d4eb7faa --- /dev/null +++ b/factory/barbet/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: barbet$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-barbet-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/barbet/flash-base.sh b/factory/barbet/flash-base.sh new file mode 100755 index 00000000..d4b3ce43 --- /dev/null +++ b/factory/barbet/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: barbet$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bluejay/flash-all.bat b/factory/bluejay/flash-all.bat new file mode 100644 index 00000000..96b7d374 --- /dev/null +++ b/factory/bluejay/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-bluejay-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh new file mode 100755 index 00000000..1725b853 --- /dev/null +++ b/factory/bluejay/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: bluejay$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-bluejay-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh new file mode 100755 index 00000000..7be6c193 --- /dev/null +++ b/factory/bluejay/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: bluejay$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bramble/flash-all.bat b/factory/bramble/flash-all.bat new file mode 100644 index 00000000..15a4fce8 --- /dev/null +++ b/factory/bramble/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: bramble" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: bramble" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-bramble-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh new file mode 100755 index 00000000..aee26dde --- /dev/null +++ b/factory/bramble/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: bramble$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-bramble-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/bramble/flash-base.sh b/factory/bramble/flash-base.sh new file mode 100755 index 00000000..cdebbc03 --- /dev/null +++ b/factory/bramble/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: bramble$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/cheetah/flash-all.bat b/factory/cheetah/flash-all.bat new file mode 100644 index 00000000..f8ed2875 --- /dev/null +++ b/factory/cheetah/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-cheetah-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh new file mode 100755 index 00000000..464d5f2c --- /dev/null +++ b/factory/cheetah/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: cheetah$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-cheetah-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh new file mode 100755 index 00000000..023fbeda --- /dev/null +++ b/factory/cheetah/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: cheetah$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/coral/flash-all.bat b/factory/coral/flash-all.bat new file mode 100644 index 00000000..f5455d47 --- /dev/null +++ b/factory/coral/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: coral" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: coral" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-coral-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/coral/flash-all.sh b/factory/coral/flash-all.sh new file mode 100755 index 00000000..74a08f7c --- /dev/null +++ b/factory/coral/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: coral$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-coral-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/coral/flash-base.sh b/factory/coral/flash-base.sh new file mode 100755 index 00000000..921d6a4b --- /dev/null +++ b/factory/coral/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: coral$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/devon/flash-all.bat b/factory/devon/flash-all.bat new file mode 100644 index 00000000..a4c5562b --- /dev/null +++ b/factory/devon/flash-all.bat @@ -0,0 +1,76 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: devon" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: devon" || exit /B 1 +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-devon-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/devon/flash-all.sh b/factory/devon/flash-all.sh new file mode 100755 index 00000000..df4ed9c7 --- /dev/null +++ b/factory/devon/flash-all.sh @@ -0,0 +1,79 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: devon$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-devon-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/devon/flash-base.sh b/factory/devon/flash-base.sh new file mode 100755 index 00000000..7755a444 --- /dev/null +++ b/factory/devon/flash-base.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: devon$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/felix/flash-all.bat b/factory/felix/flash-all.bat new file mode 100644 index 00000000..8580a754 --- /dev/null +++ b/factory/felix/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-felix-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh new file mode 100755 index 00000000..1bbcc58d --- /dev/null +++ b/factory/felix/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: felix$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-felix-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh new file mode 100755 index 00000000..9a30dd64 --- /dev/null +++ b/factory/felix/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: felix$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/flame/flash-all.bat b/factory/flame/flash-all.bat new file mode 100644 index 00000000..85843c48 --- /dev/null +++ b/factory/flame/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: flame" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: flame" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-flame-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/flame/flash-all.sh b/factory/flame/flash-all.sh new file mode 100755 index 00000000..b00d9d47 --- /dev/null +++ b/factory/flame/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: flame$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-flame-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/flame/flash-base.sh b/factory/flame/flash-base.sh new file mode 100755 index 00000000..e63caf92 --- /dev/null +++ b/factory/flame/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: flame$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/hawao/flash-all.bat b/factory/hawao/flash-all.bat new file mode 100644 index 00000000..cdb57ed0 --- /dev/null +++ b/factory/hawao/flash-all.bat @@ -0,0 +1,76 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: hawao" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: hawao" || exit /B 1 +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-hawao-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/hawao/flash-all.sh b/factory/hawao/flash-all.sh new file mode 100755 index 00000000..b84404f8 --- /dev/null +++ b/factory/hawao/flash-all.sh @@ -0,0 +1,79 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: hawao$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-hawao-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/hawao/flash-base.sh b/factory/hawao/flash-base.sh new file mode 100755 index 00000000..b152beab --- /dev/null +++ b/factory/hawao/flash-base.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: hawao$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/husky/flash-all.bat b/factory/husky/flash-all.bat new file mode 100644 index 00000000..47e0bb48 --- /dev/null +++ b/factory/husky/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-husky-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh new file mode 100755 index 00000000..dd4bac83 --- /dev/null +++ b/factory/husky/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: husky$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-husky-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh new file mode 100755 index 00000000..09c74ac4 --- /dev/null +++ b/factory/husky/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: husky$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/lynx/flash-all.bat b/factory/lynx/flash-all.bat new file mode 100644 index 00000000..b5b4465e --- /dev/null +++ b/factory/lynx/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-lynx-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh new file mode 100755 index 00000000..b965ca01 --- /dev/null +++ b/factory/lynx/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: lynx$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-lynx-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh new file mode 100755 index 00000000..ec555373 --- /dev/null +++ b/factory/lynx/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: lynx$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/oriole/flash-all.bat b/factory/oriole/flash-all.bat new file mode 100644 index 00000000..a9f8460d --- /dev/null +++ b/factory/oriole/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-oriole-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh new file mode 100755 index 00000000..808e9fd8 --- /dev/null +++ b/factory/oriole/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: oriole$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-oriole-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh new file mode 100755 index 00000000..fe807b55 --- /dev/null +++ b/factory/oriole/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: oriole$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/panther/flash-all.bat b/factory/panther/flash-all.bat new file mode 100644 index 00000000..98cc22c6 --- /dev/null +++ b/factory/panther/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-panther-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh new file mode 100755 index 00000000..9c55638f --- /dev/null +++ b/factory/panther/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: panther$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-panther-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh new file mode 100755 index 00000000..dfd61e8c --- /dev/null +++ b/factory/panther/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: panther$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/raven/flash-all.bat b/factory/raven/flash-all.bat new file mode 100644 index 00000000..a62934bd --- /dev/null +++ b/factory/raven/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-raven-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh new file mode 100755 index 00000000..21d2a04b --- /dev/null +++ b/factory/raven/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: raven$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-raven-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh new file mode 100755 index 00000000..050c0d3e --- /dev/null +++ b/factory/raven/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: raven$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/redfin/flash-all.bat b/factory/redfin/flash-all.bat new file mode 100644 index 00000000..a55df18b --- /dev/null +++ b/factory/redfin/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: redfin" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: redfin" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-redfin-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh new file mode 100755 index 00000000..e28a6080 --- /dev/null +++ b/factory/redfin/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: redfin$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-redfin-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/redfin/flash-base.sh b/factory/redfin/flash-base.sh new file mode 100755 index 00000000..d0f22b21 --- /dev/null +++ b/factory/redfin/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: redfin$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/rhode/flash-all.bat b/factory/rhode/flash-all.bat new file mode 100644 index 00000000..da35ee30 --- /dev/null +++ b/factory/rhode/flash-all.bat @@ -0,0 +1,76 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: rhode" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: rhode" || exit /B 1 +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-rhode-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/rhode/flash-all.sh b/factory/rhode/flash-all.sh new file mode 100755 index 00000000..68118360 --- /dev/null +++ b/factory/rhode/flash-all.sh @@ -0,0 +1,79 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: rhode$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-rhode-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/rhode/flash-base.sh b/factory/rhode/flash-base.sh new file mode 100755 index 00000000..f52292a0 --- /dev/null +++ b/factory/rhode/flash-base.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: rhode$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot oem fb_mode_set + +fastboot flash partition partition.img + +fastboot flash keymaster_a keymaster.img +fastboot flash keymaster_b keymaster.img +fastboot flash hyp_a hyp.img +fastboot flash hyp_b hyp.img +fastboot flash tz_a tz.img +fastboot flash tz_b tz.img +fastboot flash devcfg_a devcfg.img +fastboot flash devcfg_b devcfg.img +fastboot flash storsec_a storsec.img +fastboot flash storsec_b storsec.img +fastboot flash prov_a prov.img +fastboot flash prov_b prov.img +fastboot flash rpm_a rpm.img +fastboot flash rpm_b rpm.img +fastboot flash abl_a abl.img +fastboot flash abl_b abl.img +fastboot flash uefisecapp_a uefisecapp.img +fastboot flash uefisecapp_b uefisecapp.img +fastboot flash qupfw_a qupfw.img +fastboot flash qupfw_b qupfw.img +fastboot flash xbl_config_a xbl_config.img +fastboot flash xbl_config_b xbl_config.img +fastboot flash xbl_a xbl.img +fastboot flash xbl_b xbl.img + +fastboot flash modem_a modem.img +fastboot flash modem_b modem.img +fastboot flash fsg_a fsg.img +fastboot flash fsg_b fsg.img + +fastboot flash bluetooth_a bluetooth.img +fastboot flash bluetooth_b bluetooth.img +fastboot flash dsp_a dsp.img +fastboot flash dsp_b dsp.img +fastboot flash logo_a logo.img +fastboot flash logo_b logo.img + +fastboot erase ddr + +fastboot oem fb_mode_clear + +fastboot --set-active=a + +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/shiba/flash-all.bat b/factory/shiba/flash-all.bat new file mode 100644 index 00000000..a1e20a4b --- /dev/null +++ b/factory/shiba/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-shiba-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh new file mode 100755 index 00000000..da86f336 --- /dev/null +++ b/factory/shiba/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: shiba$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-shiba-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh new file mode 100755 index 00000000..ede0f2c4 --- /dev/null +++ b/factory/shiba/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: shiba$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sunfish/flash-all.bat b/factory/sunfish/flash-all.bat new file mode 100644 index 00000000..af5c4df0 --- /dev/null +++ b/factory/sunfish/flash-all.bat @@ -0,0 +1,39 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: sunfish" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: sunfish" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-sunfish-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/sunfish/flash-all.sh b/factory/sunfish/flash-all.sh new file mode 100755 index 00000000..c365a4e5 --- /dev/null +++ b/factory/sunfish/flash-all.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: sunfish$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-sunfish-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/sunfish/flash-base.sh b/factory/sunfish/flash-base.sh new file mode 100755 index 00000000..817d25ec --- /dev/null +++ b/factory/sunfish/flash-base.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: sunfish$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/tangorpro/flash-all.bat b/factory/tangorpro/flash-all.bat new file mode 100644 index 00000000..a4f4d72d --- /dev/null +++ b/factory/tangorpro/flash-all.bat @@ -0,0 +1,33 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || exit /B 1 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-tangorpro-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh new file mode 100755 index 00000000..2984437b --- /dev/null +++ b/factory/tangorpro/flash-all.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: tangorpro$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-tangorpro-ap1a.240405.002.a1.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh new file mode 100755 index 00000000..3f9172aa --- /dev/null +++ b/factory/tangorpro/flash-base.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: tangorpro$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img From 9b79a0609532bd0b62492a234e3db34d77dc53df Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 4 Apr 2024 21:57:54 +0530 Subject: [PATCH 029/111] Check in missing factory image scripts from 5.4.1 Change-Id: Ibeefbddcaa3a4cd5a7ef678755463a05a1db859f --- factory/blueline/flash-all.bat | 33 +++++++++++++++++++++++++++++ factory/blueline/flash-all.sh | 36 ++++++++++++++++++++++++++++++++ factory/blueline/flash-base.sh | 33 +++++++++++++++++++++++++++++ factory/bonito/flash-all.bat | 33 +++++++++++++++++++++++++++++ factory/bonito/flash-all.sh | 36 ++++++++++++++++++++++++++++++++ factory/bonito/flash-base.sh | 33 +++++++++++++++++++++++++++++ factory/crosshatch/flash-all.bat | 33 +++++++++++++++++++++++++++++ factory/crosshatch/flash-all.sh | 36 ++++++++++++++++++++++++++++++++ factory/crosshatch/flash-base.sh | 33 +++++++++++++++++++++++++++++ factory/sargo/flash-all.bat | 33 +++++++++++++++++++++++++++++ factory/sargo/flash-all.sh | 36 ++++++++++++++++++++++++++++++++ factory/sargo/flash-base.sh | 33 +++++++++++++++++++++++++++++ 12 files changed, 408 insertions(+) create mode 100644 factory/blueline/flash-all.bat create mode 100755 factory/blueline/flash-all.sh create mode 100755 factory/blueline/flash-base.sh create mode 100644 factory/bonito/flash-all.bat create mode 100755 factory/bonito/flash-all.sh create mode 100755 factory/bonito/flash-base.sh create mode 100644 factory/crosshatch/flash-all.bat create mode 100755 factory/crosshatch/flash-all.sh create mode 100755 factory/crosshatch/flash-base.sh create mode 100644 factory/sargo/flash-all.bat create mode 100755 factory/sargo/flash-all.sh create mode 100755 factory/sargo/flash-base.sh diff --git a/factory/blueline/flash-all.bat b/factory/blueline/flash-all.bat new file mode 100644 index 00000000..e960eaca --- /dev/null +++ b/factory/blueline/flash-all.bat @@ -0,0 +1,33 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: blueline" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: blueline" || exit /B 1 +fastboot flash bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot flash radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-blueline-uq1a.240205.004.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/blueline/flash-all.sh b/factory/blueline/flash-all.sh new file mode 100755 index 00000000..d3a48475 --- /dev/null +++ b/factory/blueline/flash-all.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: blueline$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-blueline-uq1a.240205.004.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/blueline/flash-base.sh b/factory/blueline/flash-base.sh new file mode 100755 index 00000000..7d12b2cb --- /dev/null +++ b/factory/blueline/flash-base.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: blueline$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bonito/flash-all.bat b/factory/bonito/flash-all.bat new file mode 100644 index 00000000..2d3b7441 --- /dev/null +++ b/factory/bonito/flash-all.bat @@ -0,0 +1,33 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: bonito" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: bonito" || exit /B 1 +fastboot flash bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot flash radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-bonito-uq1a.240205.004.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/bonito/flash-all.sh b/factory/bonito/flash-all.sh new file mode 100755 index 00000000..ea1b33e4 --- /dev/null +++ b/factory/bonito/flash-all.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: bonito$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-bonito-uq1a.240205.004.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/bonito/flash-base.sh b/factory/bonito/flash-base.sh new file mode 100755 index 00000000..61d9e4da --- /dev/null +++ b/factory/bonito/flash-base.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: bonito$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/crosshatch/flash-all.bat b/factory/crosshatch/flash-all.bat new file mode 100644 index 00000000..aa7e0b01 --- /dev/null +++ b/factory/crosshatch/flash-all.bat @@ -0,0 +1,33 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: crosshatch" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: crosshatch" || exit /B 1 +fastboot flash bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot flash radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-crosshatch-uq1a.240205.004.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/crosshatch/flash-all.sh b/factory/crosshatch/flash-all.sh new file mode 100755 index 00000000..48bee308 --- /dev/null +++ b/factory/crosshatch/flash-all.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: crosshatch$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-crosshatch-uq1a.240205.004.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/crosshatch/flash-base.sh b/factory/crosshatch/flash-base.sh new file mode 100755 index 00000000..105824bc --- /dev/null +++ b/factory/crosshatch/flash-base.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: crosshatch$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sargo/flash-all.bat b/factory/sargo/flash-all.bat new file mode 100644 index 00000000..d0ebae94 --- /dev/null +++ b/factory/sargo/flash-all.bat @@ -0,0 +1,33 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: sargo" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: sargo" || exit /B 1 +fastboot flash bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot flash radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-sargo-uq1a.240205.004.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/sargo/flash-all.sh b/factory/sargo/flash-all.sh new file mode 100755 index 00000000..eccdba5c --- /dev/null +++ b/factory/sargo/flash-all.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: sargo$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-sargo-uq1a.240205.004.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/sargo/flash-base.sh b/factory/sargo/flash-base.sh new file mode 100755 index 00000000..28ecfae0 --- /dev/null +++ b/factory/sargo/flash-base.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: sargo$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img From 2f998713f5cfe6bc98ab33060e92a43b9d715d8c Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 4 Apr 2024 21:58:55 +0530 Subject: [PATCH 030/111] factory: Chain from 5.6.0 to 003effe "Fix fastboot version check" Change-Id: I9913f4bc86a9904e4d679c9ccf14017bfe7d9b2a --- factory/FP4/flash-all.bat | 91 +++++++++++++-------------- factory/FP4/flash-all.sh | 9 +-- factory/FP4/flash-base.sh | 12 ++-- factory/FP5/flash-all.bat | 105 +++++++++++++++---------------- factory/FP5/flash-all.sh | 9 +-- factory/FP5/flash-base.sh | 9 +-- factory/axolotl/flash-all.bat | 79 ++++++++++++----------- factory/axolotl/flash-all.sh | 9 +-- factory/axolotl/flash-base.sh | 9 +-- factory/barbet/flash-all.bat | 9 +-- factory/barbet/flash-all.sh | 5 +- factory/barbet/flash-base.sh | 5 +- factory/bluejay/flash-all.bat | 9 +-- factory/bluejay/flash-all.sh | 5 +- factory/bluejay/flash-base.sh | 5 +- factory/blueline/flash-all.bat | 23 ++++--- factory/blueline/flash-all.sh | 21 +++++-- factory/blueline/flash-base.sh | 19 ++++-- factory/bonito/flash-all.bat | 23 ++++--- factory/bonito/flash-all.sh | 21 +++++-- factory/bonito/flash-base.sh | 19 ++++-- factory/bramble/flash-all.bat | 9 +-- factory/bramble/flash-all.sh | 5 +- factory/bramble/flash-base.sh | 5 +- factory/cheetah/flash-all.bat | 9 +-- factory/cheetah/flash-all.sh | 5 +- factory/cheetah/flash-base.sh | 5 +- factory/coral/flash-all.bat | 9 +-- factory/coral/flash-all.sh | 5 +- factory/coral/flash-base.sh | 5 +- factory/crosshatch/flash-all.bat | 23 ++++--- factory/crosshatch/flash-all.sh | 21 +++++-- factory/crosshatch/flash-base.sh | 19 ++++-- factory/devon/flash-all.bat | 91 +++++++++++++-------------- factory/devon/flash-all.sh | 9 +-- factory/devon/flash-base.sh | 9 +-- factory/felix/flash-all.bat | 9 +-- factory/felix/flash-all.sh | 5 +- factory/felix/flash-base.sh | 5 +- factory/flame/flash-all.bat | 9 +-- factory/flame/flash-all.sh | 5 +- factory/flame/flash-base.sh | 5 +- factory/hawao/flash-all.bat | 91 +++++++++++++-------------- factory/hawao/flash-all.sh | 9 +-- factory/hawao/flash-base.sh | 9 +-- factory/husky/flash-all.bat | 9 +-- factory/husky/flash-all.sh | 5 +- factory/husky/flash-base.sh | 5 +- factory/lynx/flash-all.bat | 9 +-- factory/lynx/flash-all.sh | 5 +- factory/lynx/flash-base.sh | 5 +- factory/oriole/flash-all.bat | 9 +-- factory/oriole/flash-all.sh | 5 +- factory/oriole/flash-base.sh | 5 +- factory/panther/flash-all.bat | 9 +-- factory/panther/flash-all.sh | 5 +- factory/panther/flash-base.sh | 5 +- factory/raven/flash-all.bat | 9 +-- factory/raven/flash-all.sh | 5 +- factory/raven/flash-base.sh | 5 +- factory/redfin/flash-all.bat | 9 +-- factory/redfin/flash-all.sh | 5 +- factory/redfin/flash-base.sh | 5 +- factory/rhode/flash-all.bat | 91 +++++++++++++-------------- factory/rhode/flash-all.sh | 9 +-- factory/rhode/flash-base.sh | 9 +-- factory/sargo/flash-all.bat | 23 ++++--- factory/sargo/flash-all.sh | 21 +++++-- factory/sargo/flash-base.sh | 19 ++++-- factory/shiba/flash-all.bat | 9 +-- factory/shiba/flash-all.sh | 5 +- factory/shiba/flash-base.sh | 5 +- factory/sunfish/flash-all.bat | 9 +-- factory/sunfish/flash-all.sh | 5 +- factory/sunfish/flash-base.sh | 5 +- factory/tangorpro/flash-all.bat | 9 +-- factory/tangorpro/flash-all.sh | 5 +- factory/tangorpro/flash-base.sh | 5 +- 78 files changed, 715 insertions(+), 500 deletions(-) diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat index 62f95cff..76d30846 100644 --- a/factory/FP4/flash-all.bat +++ b/factory/FP4/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,56 +17,54 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || exit /B 1 -fastboot flash abl_a abl.img || ( echo WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device! && exit /B 1 ) -fastboot flash abl_b abl.img -fastboot flash aop_a aop.img -fastboot flash aop_b aop.img -fastboot flash bluetooth_a bluetooth.img -fastboot flash bluetooth_b bluetooth.img -fastboot flash core_nhlos_a core_nhlos.img -fastboot flash core_nhlos_b core_nhlos.img -fastboot flash devcfg_a devcfg.img -fastboot flash devcfg_b devcfg.img -fastboot flash dsp_a dsp.img -fastboot flash dsp_b dsp.img -fastboot flash featenabler_a featenabler.img -fastboot flash featenabler_b featenabler.img -fastboot flash hyp_a hyp.img -fastboot flash hyp_b hyp.img -fastboot flash imagefv_a imagefv.img -fastboot flash imagefv_b imagefv.img -fastboot flash keymaster_a keymaster.img -fastboot flash keymaster_b keymaster.img -fastboot flash modem_a modem.img -fastboot flash modem_b modem.img -fastboot flash multiimgoem_a multiimgoem.img -fastboot flash multiimgoem_b multiimgoem.img -fastboot flash qupfw_a qupfw.img -fastboot flash qupfw_b qupfw.img -fastboot flash tz_a tz.img -fastboot flash tz_b tz.img -fastboot flash uefisecapp_a uefisecapp.img -fastboot flash uefisecapp_b uefisecapp.img -fastboot flash xbl_a xbl.img -fastboot flash xbl_b xbl.img -fastboot flash xbl_config_a xbl_config.img -fastboot flash xbl_config_b xbl_config.img - -fastboot flash frp frp.img -fastboot flash devinfo devinfo.img +fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } || exit /B 1 +fastboot flash abl_b abl.img || exit /B 1 +fastboot flash aop_a aop.img || exit /B 1 +fastboot flash aop_b aop.img || exit /B 1 +fastboot flash bluetooth_a bluetooth.img || exit /B 1 +fastboot flash bluetooth_b bluetooth.img || exit /B 1 +fastboot flash core_nhlos_a core_nhlos.img || exit /B 1 +fastboot flash core_nhlos_b core_nhlos.img || exit /B 1 +fastboot flash devcfg_a devcfg.img || exit /B 1 +fastboot flash devcfg_b devcfg.img || exit /B 1 +fastboot flash dsp_a dsp.img || exit /B 1 +fastboot flash dsp_b dsp.img || exit /B 1 +fastboot flash featenabler_a featenabler.img || exit /B 1 +fastboot flash featenabler_b featenabler.img || exit /B 1 +fastboot flash hyp_a hyp.img || exit /B 1 +fastboot flash hyp_b hyp.img || exit /B 1 +fastboot flash imagefv_a imagefv.img || exit /B 1 +fastboot flash imagefv_b imagefv.img || exit /B 1 +fastboot flash keymaster_a keymaster.img || exit /B 1 +fastboot flash keymaster_b keymaster.img || exit /B 1 +fastboot flash modem_a modem.img || exit /B 1 +fastboot flash modem_b modem.img || exit /B 1 +fastboot flash multiimgoem_a multiimgoem.img || exit /B 1 +fastboot flash multiimgoem_b multiimgoem.img || exit /B 1 +fastboot flash qupfw_a qupfw.img || exit /B 1 +fastboot flash qupfw_b qupfw.img || exit /B 1 +fastboot flash tz_a tz.img || exit /B 1 +fastboot flash tz_b tz.img || exit /B 1 +fastboot flash uefisecapp_a uefisecapp.img || exit /B 1 +fastboot flash uefisecapp_b uefisecapp.img || exit /B 1 +fastboot flash xbl_a xbl.img || exit /B 1 +fastboot flash xbl_b xbl.img || exit /B 1 +fastboot flash xbl_config_a xbl_config.img || exit /B 1 +fastboot flash xbl_config_b xbl_config.img || exit /B 1 -fastboot erase misc -fastboot erase modemst1 -fastboot erase modemst2 +fastboot flash frp frp.img || exit /B 1 +fastboot flash devinfo devinfo.img || exit /B 1 -fastboot --set-active=a +fastboot erase misc || exit /B 1 +fastboot erase modemst1 || exit /B 1 +fastboot erase modemst2 || exit /B 1 -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-FP4-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-FP4-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index 32a392fc..b2a66d50 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -65,9 +68,7 @@ fastboot erase misc fastboot erase modemst1 fastboot erase modemst2 -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/FP4/flash-base.sh b/factory/FP4/flash-base.sh index bc136b15..e3470063 100755 --- a/factory/FP4/flash-base.sh +++ b/factory/FP4/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -58,9 +61,6 @@ fastboot flash xbl_b xbl.img fastboot flash xbl_config_a xbl_config.img fastboot flash xbl_config_b xbl_config.img -fastboot flash userdata userdata.img -fastboot flash metadata metadata.img - fastboot flash frp frp.img fastboot flash devinfo devinfo.img @@ -68,9 +68,7 @@ fastboot erase misc fastboot erase modemst1 fastboot erase modemst2 -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/FP5/flash-all.bat b/factory/FP5/flash-all.bat index a5a419a2..4b497705 100644 --- a/factory/FP5/flash-all.bat +++ b/factory/FP5/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,64 +17,62 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || exit /B 1 -fastboot flash abl_a abl.img || ( echo WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device! && exit /B 1 ) -fastboot flash abl_b abl.img -fastboot flash aop_a aop.img -fastboot flash aop_b aop.img -fastboot flash bluetooth_a bluetooth.img -fastboot flash bluetooth_b bluetooth.img -fastboot flash cpucp_a cpucp.img -fastboot flash cpucp_b cpucp.img -fastboot flash devcfg_a devcfg.img -fastboot flash devcfg_b devcfg.img -fastboot flash dsp_a dsp.img -fastboot flash dsp_b dsp.img -fastboot flash featenabler_a featenabler.img -fastboot flash featenabler_b featenabler.img -fastboot flash hyp_a hyp.img -fastboot flash hyp_b hyp.img -fastboot flash imagefv_a imagefv.img -fastboot flash imagefv_b imagefv.img -fastboot flash keymaster_a keymaster.img -fastboot flash keymaster_b keymaster.img -fastboot flash modem_a modem.img -fastboot flash modem_b modem.img -fastboot flash multiimgoem_a multiimgoem.img -fastboot flash multiimgoem_b multiimgoem.img -fastboot flash qupfw_a qupfw.img -fastboot flash qupfw_b qupfw.img -fastboot flash shrm_a shrm.img -fastboot flash shrm_b shrm.img -fastboot flash studybk_a studybk.img -fastboot flash studybk_b studybk.img -fastboot flash tz_a tz.img -fastboot flash tz_b tz.img -fastboot flash uefisecapp_a uefisecapp.img -fastboot flash uefisecapp_b uefisecapp.img -fastboot flash xbl_a xbl.img -fastboot flash xbl_b xbl.img -fastboot flash xbl_config_a xbl_config.img -fastboot flash xbl_config_b xbl_config.img - -fastboot flash apdp apdp.img -fastboot flash ddr ddr.img -fastboot flash logfs logfs.img -fastboot flash rtice rtice.img -fastboot flash storsec storsec.img -fastboot flash study study.img +fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } || exit /B 1 +fastboot flash abl_b abl.img || exit /B 1 +fastboot flash aop_a aop.img || exit /B 1 +fastboot flash aop_b aop.img || exit /B 1 +fastboot flash bluetooth_a bluetooth.img || exit /B 1 +fastboot flash bluetooth_b bluetooth.img || exit /B 1 +fastboot flash cpucp_a cpucp.img || exit /B 1 +fastboot flash cpucp_b cpucp.img || exit /B 1 +fastboot flash devcfg_a devcfg.img || exit /B 1 +fastboot flash devcfg_b devcfg.img || exit /B 1 +fastboot flash dsp_a dsp.img || exit /B 1 +fastboot flash dsp_b dsp.img || exit /B 1 +fastboot flash featenabler_a featenabler.img || exit /B 1 +fastboot flash featenabler_b featenabler.img || exit /B 1 +fastboot flash hyp_a hyp.img || exit /B 1 +fastboot flash hyp_b hyp.img || exit /B 1 +fastboot flash imagefv_a imagefv.img || exit /B 1 +fastboot flash imagefv_b imagefv.img || exit /B 1 +fastboot flash keymaster_a keymaster.img || exit /B 1 +fastboot flash keymaster_b keymaster.img || exit /B 1 +fastboot flash modem_a modem.img || exit /B 1 +fastboot flash modem_b modem.img || exit /B 1 +fastboot flash multiimgoem_a multiimgoem.img || exit /B 1 +fastboot flash multiimgoem_b multiimgoem.img || exit /B 1 +fastboot flash qupfw_a qupfw.img || exit /B 1 +fastboot flash qupfw_b qupfw.img || exit /B 1 +fastboot flash shrm_a shrm.img || exit /B 1 +fastboot flash shrm_b shrm.img || exit /B 1 +fastboot flash studybk_a studybk.img || exit /B 1 +fastboot flash studybk_b studybk.img || exit /B 1 +fastboot flash tz_a tz.img || exit /B 1 +fastboot flash tz_b tz.img || exit /B 1 +fastboot flash uefisecapp_a uefisecapp.img || exit /B 1 +fastboot flash uefisecapp_b uefisecapp.img || exit /B 1 +fastboot flash xbl_a xbl.img || exit /B 1 +fastboot flash xbl_b xbl.img || exit /B 1 +fastboot flash xbl_config_a xbl_config.img || exit /B 1 +fastboot flash xbl_config_b xbl_config.img || exit /B 1 -fastboot flash frp frp.img +fastboot flash apdp apdp.img || exit /B 1 +fastboot flash ddr ddr.img || exit /B 1 +fastboot flash logfs logfs.img || exit /B 1 +fastboot flash rtice rtice.img || exit /B 1 +fastboot flash storsec storsec.img || exit /B 1 +fastboot flash study study.img || exit /B 1 -fastboot erase misc +fastboot flash frp frp.img || exit /B 1 -fastboot --set-active=a +fastboot erase misc || exit /B 1 -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-FP5-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-FP5-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh index 015b4d75..2733b340 100755 --- a/factory/FP5/flash-all.sh +++ b/factory/FP5/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -73,9 +76,7 @@ fastboot flash frp frp.img fastboot erase misc -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/FP5/flash-base.sh b/factory/FP5/flash-base.sh index 71fd2b26..96c890d3 100755 --- a/factory/FP5/flash-base.sh +++ b/factory/FP5/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -73,9 +76,7 @@ fastboot flash frp frp.img fastboot erase misc -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/axolotl/flash-all.bat b/factory/axolotl/flash-all.bat index f9826298..85963947 100644 --- a/factory/axolotl/flash-all.bat +++ b/factory/axolotl/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,49 +17,47 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: sdm845" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: sdm845" || exit /B 1 -fastboot flash ImageFv_a ImageFv.img -fastboot flash ImageFv_b ImageFv.img -fastboot flash abl_a abl.img -fastboot flash abl_b abl.img -fastboot flash aop_a aop.img -fastboot flash aop_b aop.img -fastboot flash bluetooth_a bluetooth.img -fastboot flash bluetooth_b bluetooth.img -fastboot flash cmnlib_a cmnlib.img -fastboot flash cmnlib_b cmnlib.img -fastboot flash cmnlib64_a cmnlib64.img -fastboot flash cmnlib64_b cmnlib64.img -fastboot flash devcfg_a devcfg.img -fastboot flash devcfg_b devcfg.img -fastboot flash dsp_a dsp.img -fastboot flash dsp_b dsp.img -fastboot flash hyp_a hyp.img -fastboot flash hyp_b hyp.img -fastboot flash keymaster_a keymaster.img -fastboot flash keymaster_b keymaster.img -fastboot flash modem_a modem.img -fastboot flash modem_b modem.img -fastboot flash qupfw_a qupfw.img -fastboot flash qupfw_b qupfw.img -fastboot flash storsec_a storsec.img -fastboot flash storsec_b storsec.img -fastboot flash tz_a tz.img -fastboot flash tz_b tz.img -fastboot flash xbl_a xbl.img -fastboot flash xbl_b xbl.img -fastboot flash xbl_config_a xbl_config.img -fastboot flash xbl_config_b xbl_config.img - -fastboot flash frp frp.img -fastboot flash devinfo devinfo.bin +fastboot flash ImageFv_a ImageFv.img || exit /B 1 +fastboot flash ImageFv_b ImageFv.img || exit /B 1 +fastboot flash abl_a abl.img || exit /B 1 +fastboot flash abl_b abl.img || exit /B 1 +fastboot flash aop_a aop.img || exit /B 1 +fastboot flash aop_b aop.img || exit /B 1 +fastboot flash bluetooth_a bluetooth.img || exit /B 1 +fastboot flash bluetooth_b bluetooth.img || exit /B 1 +fastboot flash cmnlib_a cmnlib.img || exit /B 1 +fastboot flash cmnlib_b cmnlib.img || exit /B 1 +fastboot flash cmnlib64_a cmnlib64.img || exit /B 1 +fastboot flash cmnlib64_b cmnlib64.img || exit /B 1 +fastboot flash devcfg_a devcfg.img || exit /B 1 +fastboot flash devcfg_b devcfg.img || exit /B 1 +fastboot flash dsp_a dsp.img || exit /B 1 +fastboot flash dsp_b dsp.img || exit /B 1 +fastboot flash hyp_a hyp.img || exit /B 1 +fastboot flash hyp_b hyp.img || exit /B 1 +fastboot flash keymaster_a keymaster.img || exit /B 1 +fastboot flash keymaster_b keymaster.img || exit /B 1 +fastboot flash modem_a modem.img || exit /B 1 +fastboot flash modem_b modem.img || exit /B 1 +fastboot flash qupfw_a qupfw.img || exit /B 1 +fastboot flash qupfw_b qupfw.img || exit /B 1 +fastboot flash storsec_a storsec.img || exit /B 1 +fastboot flash storsec_b storsec.img || exit /B 1 +fastboot flash tz_a tz.img || exit /B 1 +fastboot flash tz_b tz.img || exit /B 1 +fastboot flash xbl_a xbl.img || exit /B 1 +fastboot flash xbl_b xbl.img || exit /B 1 +fastboot flash xbl_config_a xbl_config.img || exit /B 1 +fastboot flash xbl_config_b xbl_config.img || exit /B 1 -fastboot --set-active=a +fastboot flash frp frp.img || exit /B 1 +fastboot flash devinfo devinfo.bin || exit /B 1 -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/axolotl/flash-all.sh b/factory/axolotl/flash-all.sh index bc368f03..3e3485eb 100755 --- a/factory/axolotl/flash-all.sh +++ b/factory/axolotl/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -59,9 +62,7 @@ fastboot flash xbl_config_b xbl_config.img fastboot flash frp frp.img fastboot flash devinfo devinfo.bin -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip diff --git a/factory/axolotl/flash-base.sh b/factory/axolotl/flash-base.sh index de49d478..540c8e53 100755 --- a/factory/axolotl/flash-base.sh +++ b/factory/axolotl/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -59,8 +62,6 @@ fastboot flash xbl_config_b xbl_config.img fastboot flash frp frp.img fastboot flash devinfo devinfo.bin -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/barbet/flash-all.bat b/factory/barbet/flash-all.bat index 207376cc..8deeb988 100644 --- a/factory/barbet/flash-all.bat +++ b/factory/barbet/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-barbet-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-barbet-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh index d4eb7faa..4734a23e 100755 --- a/factory/barbet/flash-all.sh +++ b/factory/barbet/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/barbet/flash-base.sh b/factory/barbet/flash-base.sh index d4b3ce43..d479db26 100755 --- a/factory/barbet/flash-base.sh +++ b/factory/barbet/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/bluejay/flash-all.bat b/factory/bluejay/flash-all.bat index 96b7d374..1b7e5a50 100644 --- a/factory/bluejay/flash-all.bat +++ b/factory/bluejay/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bluejay-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-bluejay-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh index 1725b853..64fdaefb 100755 --- a/factory/bluejay/flash-all.sh +++ b/factory/bluejay/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh index 7be6c193..764233d1 100755 --- a/factory/bluejay/flash-base.sh +++ b/factory/bluejay/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/blueline/flash-all.bat b/factory/blueline/flash-all.bat index e960eaca..18301ba3 100644 --- a/factory/blueline/flash-all.bat +++ b/factory/blueline/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,16 +17,22 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: blueline" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: blueline" || exit /B 1 -fastboot flash bootloader bootloader-blueline-b1c1-0.4-7617406.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash radio radio-blueline-g845-00194-210812-B-7635520.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-blueline-uq1a.240205.004.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-blueline-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/blueline/flash-all.sh b/factory/blueline/flash-all.sh index d3a48475..4c36c6c0 100755 --- a/factory/blueline/flash-all.sh +++ b/factory/blueline/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,14 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-blueline-b1c1-0.4-7617406.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-blueline-g845-00194-210812-B-7635520.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-blueline-uq1a.240205.004.zip +fastboot --skip-reboot -w update image-blueline-ap1a.240405.002.a1.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/blueline/flash-base.sh b/factory/blueline/flash-base.sh index 7d12b2cb..7697eebc 100755 --- a/factory/blueline/flash-base.sh +++ b/factory/blueline/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,11 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-blueline-b1c1-0.4-7617406.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-blueline-g845-00194-210812-B-7635520.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bonito/flash-all.bat b/factory/bonito/flash-all.bat index 2d3b7441..e0bae114 100644 --- a/factory/bonito/flash-all.bat +++ b/factory/bonito/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,16 +17,22 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: bonito" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: bonito" || exit /B 1 -fastboot flash bootloader bootloader-bonito-b4s4-0.4-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash radio radio-bonito-g670-00145-220106-B-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bonito-uq1a.240205.004.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-bonito-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/bonito/flash-all.sh b/factory/bonito/flash-all.sh index ea1b33e4..b34c4c3f 100755 --- a/factory/bonito/flash-all.sh +++ b/factory/bonito/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,14 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-bonito-b4s4-0.4-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-bonito-g670-00145-220106-B-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bonito-uq1a.240205.004.zip +fastboot --skip-reboot -w update image-bonito-ap1a.240405.002.a1.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/bonito/flash-base.sh b/factory/bonito/flash-base.sh index 61d9e4da..e2039aa3 100755 --- a/factory/bonito/flash-base.sh +++ b/factory/bonito/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,11 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-bonito-b4s4-0.4-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-bonito-g670-00145-220106-B-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bramble/flash-all.bat b/factory/bramble/flash-all.bat index 15a4fce8..4945b936 100644 --- a/factory/bramble/flash-all.bat +++ b/factory/bramble/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bramble-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-bramble-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh index aee26dde..d3ca8bd9 100755 --- a/factory/bramble/flash-all.sh +++ b/factory/bramble/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/bramble/flash-base.sh b/factory/bramble/flash-base.sh index cdebbc03..ad2e05d0 100755 --- a/factory/bramble/flash-base.sh +++ b/factory/bramble/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/cheetah/flash-all.bat b/factory/cheetah/flash-all.bat index f8ed2875..8d585256 100644 --- a/factory/cheetah/flash-all.bat +++ b/factory/cheetah/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-cheetah-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-cheetah-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh index 464d5f2c..f6dde954 100755 --- a/factory/cheetah/flash-all.sh +++ b/factory/cheetah/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh index 023fbeda..c3b45e8a 100755 --- a/factory/cheetah/flash-base.sh +++ b/factory/cheetah/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/coral/flash-all.bat b/factory/coral/flash-all.bat index f5455d47..0992392e 100644 --- a/factory/coral/flash-all.bat +++ b/factory/coral/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-coral-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-coral-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/coral/flash-all.sh b/factory/coral/flash-all.sh index 74a08f7c..4518ac62 100755 --- a/factory/coral/flash-all.sh +++ b/factory/coral/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/coral/flash-base.sh b/factory/coral/flash-base.sh index 921d6a4b..f8d36c47 100755 --- a/factory/coral/flash-base.sh +++ b/factory/coral/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/crosshatch/flash-all.bat b/factory/crosshatch/flash-all.bat index aa7e0b01..2014387d 100644 --- a/factory/crosshatch/flash-all.bat +++ b/factory/crosshatch/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,16 +17,22 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: crosshatch" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: crosshatch" || exit /B 1 -fastboot flash bootloader bootloader-crosshatch-b1c1-0.4-7617406.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash radio radio-crosshatch-g845-00194-210812-B-7635520.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-crosshatch-uq1a.240205.004.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-crosshatch-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/crosshatch/flash-all.sh b/factory/crosshatch/flash-all.sh index 48bee308..501eb607 100755 --- a/factory/crosshatch/flash-all.sh +++ b/factory/crosshatch/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,14 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-crosshatch-b1c1-0.4-7617406.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-crosshatch-g845-00194-210812-B-7635520.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-crosshatch-uq1a.240205.004.zip +fastboot --skip-reboot -w update image-crosshatch-ap1a.240405.002.a1.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/crosshatch/flash-base.sh b/factory/crosshatch/flash-base.sh index 105824bc..ad0eb96c 100755 --- a/factory/crosshatch/flash-base.sh +++ b/factory/crosshatch/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,11 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-crosshatch-b1c1-0.4-7617406.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-crosshatch-g845-00194-210812-B-7635520.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/devon/flash-all.bat b/factory/devon/flash-all.bat index a4c5562b..02fb052b 100644 --- a/factory/devon/flash-all.bat +++ b/factory/devon/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,59 +17,57 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: devon" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: devon" || exit /B 1 -fastboot oem fb_mode_set - -fastboot flash partition partition.img +fastboot oem fb_mode_set || exit /B 1 -fastboot flash keymaster_a keymaster.img -fastboot flash keymaster_b keymaster.img -fastboot flash hyp_a hyp.img -fastboot flash hyp_b hyp.img -fastboot flash tz_a tz.img -fastboot flash tz_b tz.img -fastboot flash devcfg_a devcfg.img -fastboot flash devcfg_b devcfg.img -fastboot flash storsec_a storsec.img -fastboot flash storsec_b storsec.img -fastboot flash prov_a prov.img -fastboot flash prov_b prov.img -fastboot flash rpm_a rpm.img -fastboot flash rpm_b rpm.img -fastboot flash abl_a abl.img -fastboot flash abl_b abl.img -fastboot flash uefisecapp_a uefisecapp.img -fastboot flash uefisecapp_b uefisecapp.img -fastboot flash qupfw_a qupfw.img -fastboot flash qupfw_b qupfw.img -fastboot flash xbl_config_a xbl_config.img -fastboot flash xbl_config_b xbl_config.img -fastboot flash xbl_a xbl.img -fastboot flash xbl_b xbl.img +fastboot flash partition partition.img || exit /B 1 -fastboot flash modem_a modem.img -fastboot flash modem_b modem.img -fastboot flash fsg_a fsg.img -fastboot flash fsg_b fsg.img +fastboot flash keymaster_a keymaster.img || exit /B 1 +fastboot flash keymaster_b keymaster.img || exit /B 1 +fastboot flash hyp_a hyp.img || exit /B 1 +fastboot flash hyp_b hyp.img || exit /B 1 +fastboot flash tz_a tz.img || exit /B 1 +fastboot flash tz_b tz.img || exit /B 1 +fastboot flash devcfg_a devcfg.img || exit /B 1 +fastboot flash devcfg_b devcfg.img || exit /B 1 +fastboot flash storsec_a storsec.img || exit /B 1 +fastboot flash storsec_b storsec.img || exit /B 1 +fastboot flash prov_a prov.img || exit /B 1 +fastboot flash prov_b prov.img || exit /B 1 +fastboot flash rpm_a rpm.img || exit /B 1 +fastboot flash rpm_b rpm.img || exit /B 1 +fastboot flash abl_a abl.img || exit /B 1 +fastboot flash abl_b abl.img || exit /B 1 +fastboot flash uefisecapp_a uefisecapp.img || exit /B 1 +fastboot flash uefisecapp_b uefisecapp.img || exit /B 1 +fastboot flash qupfw_a qupfw.img || exit /B 1 +fastboot flash qupfw_b qupfw.img || exit /B 1 +fastboot flash xbl_config_a xbl_config.img || exit /B 1 +fastboot flash xbl_config_b xbl_config.img || exit /B 1 +fastboot flash xbl_a xbl.img || exit /B 1 +fastboot flash xbl_b xbl.img || exit /B 1 -fastboot flash bluetooth_a bluetooth.img -fastboot flash bluetooth_b bluetooth.img -fastboot flash dsp_a dsp.img -fastboot flash dsp_b dsp.img -fastboot flash logo_a logo.img -fastboot flash logo_b logo.img +fastboot flash modem_a modem.img || exit /B 1 +fastboot flash modem_b modem.img || exit /B 1 +fastboot flash fsg_a fsg.img || exit /B 1 +fastboot flash fsg_b fsg.img || exit /B 1 -fastboot erase ddr +fastboot flash bluetooth_a bluetooth.img || exit /B 1 +fastboot flash bluetooth_b bluetooth.img || exit /B 1 +fastboot flash dsp_a dsp.img || exit /B 1 +fastboot flash dsp_b dsp.img || exit /B 1 +fastboot flash logo_a logo.img || exit /B 1 +fastboot flash logo_b logo.img || exit /B 1 -fastboot oem fb_mode_clear +fastboot erase ddr || exit /B 1 -fastboot --set-active=a +fastboot oem fb_mode_clear || exit /B 1 -fastboot reboot-bootloader -sleep 5 -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-devon-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-devon-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/devon/flash-all.sh b/factory/devon/flash-all.sh index df4ed9c7..02eed069 100755 --- a/factory/devon/flash-all.sh +++ b/factory/devon/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -68,9 +71,7 @@ fastboot erase ddr fastboot oem fb_mode_clear -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/devon/flash-base.sh b/factory/devon/flash-base.sh index 7755a444..21e36259 100755 --- a/factory/devon/flash-base.sh +++ b/factory/devon/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -68,9 +71,7 @@ fastboot erase ddr fastboot oem fb_mode_clear -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/felix/flash-all.bat b/factory/felix/flash-all.bat index 8580a754..1140fb2c 100644 --- a/factory/felix/flash-all.bat +++ b/factory/felix/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-felix-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-felix-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh index 1bbcc58d..85379bd7 100755 --- a/factory/felix/flash-all.sh +++ b/factory/felix/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh index 9a30dd64..2c86e29f 100755 --- a/factory/felix/flash-base.sh +++ b/factory/felix/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/flame/flash-all.bat b/factory/flame/flash-all.bat index 85843c48..d882fe44 100644 --- a/factory/flame/flash-all.bat +++ b/factory/flame/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-flame-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-flame-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/flame/flash-all.sh b/factory/flame/flash-all.sh index b00d9d47..ee35720f 100755 --- a/factory/flame/flash-all.sh +++ b/factory/flame/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/flame/flash-base.sh b/factory/flame/flash-base.sh index e63caf92..1364f0fd 100755 --- a/factory/flame/flash-base.sh +++ b/factory/flame/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/hawao/flash-all.bat b/factory/hawao/flash-all.bat index cdb57ed0..7dd45d97 100644 --- a/factory/hawao/flash-all.bat +++ b/factory/hawao/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,59 +17,57 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: hawao" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: hawao" || exit /B 1 -fastboot oem fb_mode_set - -fastboot flash partition partition.img +fastboot oem fb_mode_set || exit /B 1 -fastboot flash keymaster_a keymaster.img -fastboot flash keymaster_b keymaster.img -fastboot flash hyp_a hyp.img -fastboot flash hyp_b hyp.img -fastboot flash tz_a tz.img -fastboot flash tz_b tz.img -fastboot flash devcfg_a devcfg.img -fastboot flash devcfg_b devcfg.img -fastboot flash storsec_a storsec.img -fastboot flash storsec_b storsec.img -fastboot flash prov_a prov.img -fastboot flash prov_b prov.img -fastboot flash rpm_a rpm.img -fastboot flash rpm_b rpm.img -fastboot flash abl_a abl.img -fastboot flash abl_b abl.img -fastboot flash uefisecapp_a uefisecapp.img -fastboot flash uefisecapp_b uefisecapp.img -fastboot flash qupfw_a qupfw.img -fastboot flash qupfw_b qupfw.img -fastboot flash xbl_config_a xbl_config.img -fastboot flash xbl_config_b xbl_config.img -fastboot flash xbl_a xbl.img -fastboot flash xbl_b xbl.img +fastboot flash partition partition.img || exit /B 1 -fastboot flash modem_a modem.img -fastboot flash modem_b modem.img -fastboot flash fsg_a fsg.img -fastboot flash fsg_b fsg.img +fastboot flash keymaster_a keymaster.img || exit /B 1 +fastboot flash keymaster_b keymaster.img || exit /B 1 +fastboot flash hyp_a hyp.img || exit /B 1 +fastboot flash hyp_b hyp.img || exit /B 1 +fastboot flash tz_a tz.img || exit /B 1 +fastboot flash tz_b tz.img || exit /B 1 +fastboot flash devcfg_a devcfg.img || exit /B 1 +fastboot flash devcfg_b devcfg.img || exit /B 1 +fastboot flash storsec_a storsec.img || exit /B 1 +fastboot flash storsec_b storsec.img || exit /B 1 +fastboot flash prov_a prov.img || exit /B 1 +fastboot flash prov_b prov.img || exit /B 1 +fastboot flash rpm_a rpm.img || exit /B 1 +fastboot flash rpm_b rpm.img || exit /B 1 +fastboot flash abl_a abl.img || exit /B 1 +fastboot flash abl_b abl.img || exit /B 1 +fastboot flash uefisecapp_a uefisecapp.img || exit /B 1 +fastboot flash uefisecapp_b uefisecapp.img || exit /B 1 +fastboot flash qupfw_a qupfw.img || exit /B 1 +fastboot flash qupfw_b qupfw.img || exit /B 1 +fastboot flash xbl_config_a xbl_config.img || exit /B 1 +fastboot flash xbl_config_b xbl_config.img || exit /B 1 +fastboot flash xbl_a xbl.img || exit /B 1 +fastboot flash xbl_b xbl.img || exit /B 1 -fastboot flash bluetooth_a bluetooth.img -fastboot flash bluetooth_b bluetooth.img -fastboot flash dsp_a dsp.img -fastboot flash dsp_b dsp.img -fastboot flash logo_a logo.img -fastboot flash logo_b logo.img +fastboot flash modem_a modem.img || exit /B 1 +fastboot flash modem_b modem.img || exit /B 1 +fastboot flash fsg_a fsg.img || exit /B 1 +fastboot flash fsg_b fsg.img || exit /B 1 -fastboot erase ddr +fastboot flash bluetooth_a bluetooth.img || exit /B 1 +fastboot flash bluetooth_b bluetooth.img || exit /B 1 +fastboot flash dsp_a dsp.img || exit /B 1 +fastboot flash dsp_b dsp.img || exit /B 1 +fastboot flash logo_a logo.img || exit /B 1 +fastboot flash logo_b logo.img || exit /B 1 -fastboot oem fb_mode_clear +fastboot erase ddr || exit /B 1 -fastboot --set-active=a +fastboot oem fb_mode_clear || exit /B 1 -fastboot reboot-bootloader -sleep 5 -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-hawao-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-hawao-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/hawao/flash-all.sh b/factory/hawao/flash-all.sh index b84404f8..c92a3c9a 100755 --- a/factory/hawao/flash-all.sh +++ b/factory/hawao/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -68,9 +71,7 @@ fastboot erase ddr fastboot oem fb_mode_clear -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/hawao/flash-base.sh b/factory/hawao/flash-base.sh index b152beab..dde39ba2 100755 --- a/factory/hawao/flash-base.sh +++ b/factory/hawao/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -68,9 +71,7 @@ fastboot erase ddr fastboot oem fb_mode_clear -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/husky/flash-all.bat b/factory/husky/flash-all.bat index 47e0bb48..48884e8b 100644 --- a/factory/husky/flash-all.bat +++ b/factory/husky/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-husky-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-husky-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh index dd4bac83..1e19c47d 100755 --- a/factory/husky/flash-all.sh +++ b/factory/husky/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh index 09c74ac4..38dfe5f9 100755 --- a/factory/husky/flash-base.sh +++ b/factory/husky/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/lynx/flash-all.bat b/factory/lynx/flash-all.bat index b5b4465e..1181286f 100644 --- a/factory/lynx/flash-all.bat +++ b/factory/lynx/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-lynx-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-lynx-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh index b965ca01..8ce9226a 100755 --- a/factory/lynx/flash-all.sh +++ b/factory/lynx/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh index ec555373..68850671 100755 --- a/factory/lynx/flash-base.sh +++ b/factory/lynx/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/oriole/flash-all.bat b/factory/oriole/flash-all.bat index a9f8460d..23c0f6d5 100644 --- a/factory/oriole/flash-all.bat +++ b/factory/oriole/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-oriole-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-oriole-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh index 808e9fd8..6bb104e4 100755 --- a/factory/oriole/flash-all.sh +++ b/factory/oriole/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh index fe807b55..ee62af17 100755 --- a/factory/oriole/flash-base.sh +++ b/factory/oriole/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/panther/flash-all.bat b/factory/panther/flash-all.bat index 98cc22c6..ab64ecd7 100644 --- a/factory/panther/flash-all.bat +++ b/factory/panther/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-panther-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-panther-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh index 9c55638f..7b35e611 100755 --- a/factory/panther/flash-all.sh +++ b/factory/panther/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh index dfd61e8c..5c9c5a2f 100755 --- a/factory/panther/flash-base.sh +++ b/factory/panther/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/raven/flash-all.bat b/factory/raven/flash-all.bat index a62934bd..be0b3039 100644 --- a/factory/raven/flash-all.bat +++ b/factory/raven/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-raven-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-raven-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh index 21d2a04b..78a3124c 100755 --- a/factory/raven/flash-all.sh +++ b/factory/raven/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh index 050c0d3e..c4f11e04 100755 --- a/factory/raven/flash-base.sh +++ b/factory/raven/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/redfin/flash-all.bat b/factory/redfin/flash-all.bat index a55df18b..d05cb56f 100644 --- a/factory/redfin/flash-all.bat +++ b/factory/redfin/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-redfin-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-redfin-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh index e28a6080..0a6dec7b 100755 --- a/factory/redfin/flash-all.sh +++ b/factory/redfin/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/redfin/flash-base.sh b/factory/redfin/flash-base.sh index d0f22b21..9e40df6e 100755 --- a/factory/redfin/flash-base.sh +++ b/factory/redfin/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/rhode/flash-all.bat b/factory/rhode/flash-all.bat index da35ee30..763e4c34 100644 --- a/factory/rhode/flash-all.bat +++ b/factory/rhode/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,59 +17,57 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: rhode" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: rhode" || exit /B 1 -fastboot oem fb_mode_set - -fastboot flash partition partition.img +fastboot oem fb_mode_set || exit /B 1 -fastboot flash keymaster_a keymaster.img -fastboot flash keymaster_b keymaster.img -fastboot flash hyp_a hyp.img -fastboot flash hyp_b hyp.img -fastboot flash tz_a tz.img -fastboot flash tz_b tz.img -fastboot flash devcfg_a devcfg.img -fastboot flash devcfg_b devcfg.img -fastboot flash storsec_a storsec.img -fastboot flash storsec_b storsec.img -fastboot flash prov_a prov.img -fastboot flash prov_b prov.img -fastboot flash rpm_a rpm.img -fastboot flash rpm_b rpm.img -fastboot flash abl_a abl.img -fastboot flash abl_b abl.img -fastboot flash uefisecapp_a uefisecapp.img -fastboot flash uefisecapp_b uefisecapp.img -fastboot flash qupfw_a qupfw.img -fastboot flash qupfw_b qupfw.img -fastboot flash xbl_config_a xbl_config.img -fastboot flash xbl_config_b xbl_config.img -fastboot flash xbl_a xbl.img -fastboot flash xbl_b xbl.img +fastboot flash partition partition.img || exit /B 1 -fastboot flash modem_a modem.img -fastboot flash modem_b modem.img -fastboot flash fsg_a fsg.img -fastboot flash fsg_b fsg.img +fastboot flash keymaster_a keymaster.img || exit /B 1 +fastboot flash keymaster_b keymaster.img || exit /B 1 +fastboot flash hyp_a hyp.img || exit /B 1 +fastboot flash hyp_b hyp.img || exit /B 1 +fastboot flash tz_a tz.img || exit /B 1 +fastboot flash tz_b tz.img || exit /B 1 +fastboot flash devcfg_a devcfg.img || exit /B 1 +fastboot flash devcfg_b devcfg.img || exit /B 1 +fastboot flash storsec_a storsec.img || exit /B 1 +fastboot flash storsec_b storsec.img || exit /B 1 +fastboot flash prov_a prov.img || exit /B 1 +fastboot flash prov_b prov.img || exit /B 1 +fastboot flash rpm_a rpm.img || exit /B 1 +fastboot flash rpm_b rpm.img || exit /B 1 +fastboot flash abl_a abl.img || exit /B 1 +fastboot flash abl_b abl.img || exit /B 1 +fastboot flash uefisecapp_a uefisecapp.img || exit /B 1 +fastboot flash uefisecapp_b uefisecapp.img || exit /B 1 +fastboot flash qupfw_a qupfw.img || exit /B 1 +fastboot flash qupfw_b qupfw.img || exit /B 1 +fastboot flash xbl_config_a xbl_config.img || exit /B 1 +fastboot flash xbl_config_b xbl_config.img || exit /B 1 +fastboot flash xbl_a xbl.img || exit /B 1 +fastboot flash xbl_b xbl.img || exit /B 1 -fastboot flash bluetooth_a bluetooth.img -fastboot flash bluetooth_b bluetooth.img -fastboot flash dsp_a dsp.img -fastboot flash dsp_b dsp.img -fastboot flash logo_a logo.img -fastboot flash logo_b logo.img +fastboot flash modem_a modem.img || exit /B 1 +fastboot flash modem_b modem.img || exit /B 1 +fastboot flash fsg_a fsg.img || exit /B 1 +fastboot flash fsg_b fsg.img || exit /B 1 -fastboot erase ddr +fastboot flash bluetooth_a bluetooth.img || exit /B 1 +fastboot flash bluetooth_b bluetooth.img || exit /B 1 +fastboot flash dsp_a dsp.img || exit /B 1 +fastboot flash dsp_b dsp.img || exit /B 1 +fastboot flash logo_a logo.img || exit /B 1 +fastboot flash logo_b logo.img || exit /B 1 -fastboot oem fb_mode_clear +fastboot erase ddr || exit /B 1 -fastboot --set-active=a +fastboot oem fb_mode_clear || exit /B 1 -fastboot reboot-bootloader -sleep 5 -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-rhode-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-rhode-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/rhode/flash-all.sh b/factory/rhode/flash-all.sh index 68118360..f7a3cf3f 100755 --- a/factory/rhode/flash-all.sh +++ b/factory/rhode/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -68,9 +71,7 @@ fastboot erase ddr fastboot oem fb_mode_clear -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/rhode/flash-base.sh b/factory/rhode/flash-base.sh index f52292a0..70dac78a 100755 --- a/factory/rhode/flash-base.sh +++ b/factory/rhode/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -68,9 +71,7 @@ fastboot erase ddr fastboot oem fb_mode_clear -fastboot --set-active=a - -fastboot reboot-bootloader +fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sargo/flash-all.bat b/factory/sargo/flash-all.bat index d0ebae94..1cc83578 100644 --- a/factory/sargo/flash-all.bat +++ b/factory/sargo/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,16 +17,22 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: sargo" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: sargo" || exit /B 1 -fastboot flash bootloader bootloader-sargo-b4s4-0.4-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash radio radio-sargo-g670-00145-220106-B-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-sargo-uq1a.240205.004.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-sargo-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/sargo/flash-all.sh b/factory/sargo/flash-all.sh index eccdba5c..ac3f2531 100755 --- a/factory/sargo/flash-all.sh +++ b/factory/sargo/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,14 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-sargo-b4s4-0.4-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-sargo-g670-00145-220106-B-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-sargo-uq1a.240205.004.zip +fastboot --skip-reboot -w update image-sargo-ap1a.240405.002.a1.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/sargo/flash-base.sh b/factory/sargo/flash-base.sh index 28ecfae0..54d552c4 100755 --- a/factory/sargo/flash-base.sh +++ b/factory/sargo/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,11 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-sargo-b4s4-0.4-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? +sleep 5 +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 -fastboot flash radio radio-sargo-g670-00145-220106-B-8048689.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? +fastboot --set-active=other reboot-bootloader || exit $? sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/shiba/flash-all.bat b/factory/shiba/flash-all.bat index a1e20a4b..f929d739 100644 --- a/factory/shiba/flash-all.bat +++ b/factory/shiba/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-shiba-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-shiba-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh index da86f336..273a4389 100755 --- a/factory/shiba/flash-all.sh +++ b/factory/shiba/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh index ede0f2c4..71cf91b7 100755 --- a/factory/shiba/flash-base.sh +++ b/factory/shiba/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/sunfish/flash-all.bat b/factory/sunfish/flash-all.bat index af5c4df0..e0c20244 100644 --- a/factory/sunfish/flash-all.bat +++ b/factory/sunfish/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,10 +29,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-sunfish-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-sunfish-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/sunfish/flash-all.sh b/factory/sunfish/flash-all.sh index c365a4e5..ca65cba8 100755 --- a/factory/sunfish/flash-all.sh +++ b/factory/sunfish/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/sunfish/flash-base.sh b/factory/sunfish/flash-base.sh index 817d25ec..06723df9 100755 --- a/factory/sunfish/flash-base.sh +++ b/factory/sunfish/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/tangorpro/flash-all.bat b/factory/tangorpro/flash-all.bat index a4f4d72d..f3170e59 100644 --- a/factory/tangorpro/flash-all.bat +++ b/factory/tangorpro/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,10 +23,10 @@ ping -n 5 127.0.0.1 >nul fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-tangorpro-ap1a.240405.002.a1.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-tangorpro-ap1a.240405.002.a1.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh index 2984437b..1a2fa1af 100755 --- a/factory/tangorpro/flash-all.sh +++ b/factory/tangorpro/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh index 3f9172aa..411aba2c 100755 --- a/factory/tangorpro/flash-base.sh +++ b/factory/tangorpro/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi From 28b70df9ffbe8886dea7853ba3b0032bb9ff7014 Mon Sep 17 00:00:00 2001 From: Matthias Junker-Petschick Date: Sun, 17 Mar 2024 01:56:34 +0100 Subject: [PATCH 031/111] vars: Add build_id and image_path for Fairphone 5 (FP5.TT46.A.144) Add build_id and image_path (including sha256 hash) for processing by Fairphone-specific device.sh. Change-Id: Ib551c0a1c73255c444be6cc0634f2823eaed6670 --- vars/FP5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vars/FP5 b/vars/FP5 index 863c5d56..0bc94ae2 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -5,3 +5,9 @@ device_repos=( device/fairphone/FP5 kernel/fairphone/qcm6490 ) + +# Updated manually +readonly build_id="FP5.TT46.A.144" + +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT46-factory.zip" +readonly image_sha256="da80ea12c4768e2f5dc224ca9ed68ca3ea6884770fab86050844220fe2a27721" From 17aff429090294574dddc915e80fc3fc54ad9548 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 5 Apr 2024 00:46:52 +0530 Subject: [PATCH 032/111] vars: Add FP4 URLs, add SPL to FP5 Change-Id: I9351f4a25ebcf74c6128337b7d31b0162249eda9 --- vars/FP4 | 8 ++++++++ vars/FP5 | 2 ++ 2 files changed, 10 insertions(+) diff --git a/vars/FP4 b/vars/FP4 index ec831969..33e8a944 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -5,3 +5,11 @@ device_repos=( device/fairphone/FP4 kernel/fairphone/sm7225 ) + +# Updated manually +readonly build_id="FP4.TP29.C.0101" + +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP29-factory.zip" +readonly image_sha256="07ea933771b18558cf5ab379b7ed7e4bc499806ca4321db3a73ef6e4b22de86c" + +readonly security_patch="2024-01-05" diff --git a/vars/FP5 b/vars/FP5 index 0bc94ae2..b162f5e4 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -11,3 +11,5 @@ readonly build_id="FP5.TT46.A.144" readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT46-factory.zip" readonly image_sha256="da80ea12c4768e2f5dc224ca9ed68ca3ea6884770fab86050844220fe2a27721" + +readonly security_patch="2024-02-05" From a5406ca86ec92f6283b94218b50fbc086a52a9a6 Mon Sep 17 00:00:00 2001 From: Matthias Junker-Petschick Date: Sun, 17 Mar 2024 01:59:56 +0100 Subject: [PATCH 033/111] fairphone: Add scripts for factory image downloading and extraction Add device.sh and supportive scripts for downloading Fairphone factory images and extracting them. Based on pixel scripts, slightly amended. Change-Id: I6cbee640d7423e23bb9d4cd6d106c17d490f8ae9 --- fairphone/common | 6 +++ fairphone/device.sh | 73 ++++++++++++++++++++++++++++++ fairphone/download.sh | 67 +++++++++++++++++++++++++++ fairphone/extract-factory-image.sh | 73 ++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+) create mode 100644 fairphone/common create mode 100755 fairphone/device.sh create mode 100755 fairphone/download.sh create mode 100755 fairphone/extract-factory-image.sh diff --git a/fairphone/common b/fairphone/common new file mode 100644 index 00000000..a447b7f9 --- /dev/null +++ b/fairphone/common @@ -0,0 +1,6 @@ +### CONSTANTS ### +readonly vars_path="${script_path}/../vars" +readonly top="${script_path}/../../.." + +readonly work_dir="${WORK_DIR:-/tmp/fairphone}" +readonly device="${1}" diff --git a/fairphone/device.sh b/fairphone/device.sh new file mode 100755 index 00000000..96962403 --- /dev/null +++ b/fairphone/device.sh @@ -0,0 +1,73 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2022-2024 The Calyx Institute +# +# SPDX-License-Identifier: Apache-2.0 + +# +# device: +# +# Do it all for one device +# +# +############################################################################## + + +### SET ### + +# use bash strict mode +set -euo pipefail + +### TRAPS ### + +# trap signals for clean exit +trap 'exit $?' EXIT +trap 'error_m interrupted!' SIGINT + +readonly script_path="$(dirname "$(realpath "$0")")" +source "${script_path}/common" + +## HELP MESSAGE (USAGE INFO) +# TODO + +### FUNCTIONS ### + +device() { + source "${vars_path}/${device}" + local factory_dir="${work_dir}/${device}/${build_id}/factory" + + "${script_path}/download.sh" "${device}" + "${script_path}/extract-factory-image.sh" "${device}" + + pushd "${top}" + device/fairphone/${device}/extract-files.sh "${factory_dir}/images" + popd +} + +# error message +# ARG1: error message for STDERR +# ARG2: error status +error_m() { + echo "ERROR: ${1:-'failed.'}" 1>&2 + return "${2:-1}" +} + +# print help message. +help_message() { + echo "${help_message:-'No help available.'}" +} + +main() { + if [[ $# -eq 1 ]] ; then + device + else + error_m + fi +} + +### RUN PROGRAM ### + +main "${@}" + + +## diff --git a/fairphone/download.sh b/fairphone/download.sh new file mode 100755 index 00000000..a66edbdb --- /dev/null +++ b/fairphone/download.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2024 The Calyx Institute +# +# SPDX-License-Identifier: Apache-2.0 + +# +# download: +# +# Download Fairphone factory images +# +# +############################################################################## + + +### SET ### + +# use bash strict mode +set -euo pipefail + + +### TRAPS ### + +# trap signals for clean exit +trap 'exit $?' EXIT +trap 'error_m interrupted!' SIGINT + +readonly script_path="$(dirname "$(realpath "$0")")" +source "${script_path}/common" +source "${vars_path}/${device}" + +## HELP MESSAGE (USAGE INFO) +# TODO + +### FUNCTIONS ### + +download_factory_image() { + local factory_dir="${work_dir}/${device}/${build_id}" + mkdir -p "${factory_dir}" + local output="${factory_dir}/$(basename ${image_url})" + curl --http1.1 -C - -L -o "${output}" "${image_url}" + echo "${image_sha256} ${output}" | sha256sum --check --status +} + +# error message +# ARG1: error message for STDERR +# ARG2: error status +error_m() { + echo "ERROR: ${1:-'failed.'}" 1>&2 + return "${2:-1}" +} + +# print help message. +help_message() { + echo "${help_message:-'No help available.'}" +} + +main() { + download_factory_image +} + +### RUN PROGRAM ### + +main "${@}" + + +## diff --git a/fairphone/extract-factory-image.sh b/fairphone/extract-factory-image.sh new file mode 100755 index 00000000..7a77f6c1 --- /dev/null +++ b/fairphone/extract-factory-image.sh @@ -0,0 +1,73 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2022-2024 The Calyx Institute +# +# SPDX-License-Identifier: Apache-2.0 + +# +# extract-factory-image: +# +# Extract Fairphone factory images +# +# +############################################################################## + + +### SET ### + +# use bash strict mode +set -euo pipefail + + +### TRAPS ### + +# trap signals for clean exit +trap 'exit $?' EXIT +trap 'error_m interrupted!' SIGINT + +readonly script_path="$(dirname "$(realpath "$0")")" +source "${script_path}/common" +source "${vars_path}/${device}" + +## HELP MESSAGE (USAGE INFO) +# TODO + +### FUNCTIONS ### + +extract_factory_image() { + local factory_dir="${work_dir}/${device}/${build_id}/factory" + if [[ -d "${factory_dir}" ]]; then + echo "Skipping factory image extraction, ${factory_dir} already exists" + exit + fi + mkdir -p "${factory_dir}" + local factory_zip="${work_dir}/${device}/${build_id}/$(basename ${image_url})" + echo "${image_sha256} ${factory_zip}" | sha256sum --check --status + pushd "${factory_dir}" + unzip -o "${factory_zip}" + popd +} + +# error message +# ARG1: error message for STDERR +# ARG2: error status +error_m() { + echo "ERROR: ${1:-'failed.'}" 1>&2 + return "${2:-1}" +} + +# print help message. +help_message() { + echo "${help_message:-'No help available.'}" +} + +main() { + extract_factory_image +} + +### RUN PROGRAM ### + +main "${@}" + + +## From 9db1a9496093f841fa205018ff8022c34c249160 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 7 Apr 2024 16:07:12 +0300 Subject: [PATCH 034/111] vars: Update to FP4 TP2D Change-Id: Id155da5f950e4601ad81c8e42c2e7757eada2ce2 --- vars/FP4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP4 b/vars/FP4 index 33e8a944..6ff46185 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP4.TP29.C.0101" +readonly build_id="FP4.TP2D.C.0112" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP29-factory.zip" -readonly image_sha256="07ea933771b18558cf5ab379b7ed7e4bc499806ca4321db3a73ef6e4b22de86c" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2D-factory.zip" +readonly image_sha256="c5eb86f6f4906337abe3aec896e53d0e545e90c03bc544acd12d1dee244972ea" -readonly security_patch="2024-01-05" +readonly security_patch="2024-03-05" From dc6b0ba7383dd5df125bb6c2f3c9576bce49c09f Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 17 Apr 2024 20:07:27 +0530 Subject: [PATCH 035/111] vars: Update to FP5 TT4C Change-Id: I163388390a04feb409f089f4876d3a7d4662da0e --- vars/FP5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP5 b/vars/FP5 index b162f5e4..09332365 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.TT46.A.144" +readonly build_id="FP5.TT4C.A.154" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT46-factory.zip" -readonly image_sha256="da80ea12c4768e2f5dc224ca9ed68ca3ea6884770fab86050844220fe2a27721" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT4C-factory.zip" +readonly image_sha256="4858e6e860835396b2133167e8c6ada8ad597da2d35dedb9069d59a694b0f2ba" -readonly security_patch="2024-02-05" +readonly security_patch="2024-03-05" From c35ee7f536df8f0a6ea7d31cb77941de2c45489d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 17 Apr 2024 23:41:32 +0300 Subject: [PATCH 036/111] vars: Update to AP1A.240405.002.A2/B1 Change-Id: I274555fb3aa4f41d07d9e4f0ccd5aa8c76488308 --- vars/cheetah | 18 +++++++++--------- vars/common | 2 +- vars/felix | 18 +++++++++--------- vars/husky | 18 +++++++++--------- vars/lynx | 18 +++++++++--------- vars/panther | 18 +++++++++--------- vars/shiba | 18 +++++++++--------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/vars/cheetah b/vars/cheetah index a71e5733..af5e0439 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240405.002.B1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r33" -readonly build_number="11480754" +readonly build_number="11677284" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240405.002-factory-9def9997.zip" -readonly image_sha256="9def9997c45e76178c37bfc22ccd9b4ed8d15cd010af305f59df7e5c834ce12a" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240405.002.b1-factory-a0b4650d.zip" +readonly image_sha256="a0b4650d7c21a96cf723acd2d128eece17204f75b0de0b81a650be02174fc15a" -readonly flash_url="https://flash.android.com/build/11480754?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11677284?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240405.002-e690266f.zip" -readonly ota_sha256="e690266f6bbdbfd802b5708365568d53b2e30c6e21aecfb86a707f3ae5805a1c" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240405.002.b1-b3deb9cf.zip" +readonly ota_sha256="b3deb9cf5f715e3d83cf1e222abc629451ffc07ef4fbc2331177303fb25d3194" readonly security_patch="2024-04-05" diff --git a/vars/common b/vars/common index c5128998..9e811c3a 100644 --- a/vars/common +++ b/vars/common @@ -12,7 +12,7 @@ readonly common_aosp_tag=android-14.0.0_r31 # Apr 2024, Pixel Fold readonly common_aosp_build_id=AP1A.240405.002.A1 # Apr 2024, Pixel Fold -readonly topic=apr24 +readonly topic=apr24-2 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index dc1b3d28..8399f495 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.A1" +readonly build_id="AP1A.240405.002.A2" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-s2-release" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r31" +readonly prev_aosp_tag="android-14.0.0_r31" +readonly aosp_tag="android-14.0.0_r32" -readonly build_number="11583385" +readonly build_number="11677426" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240405.002.a1-factory-6e108421.zip" -readonly image_sha256="6e108421d554799acc0796a875bf053a8e99b9ddfdb2e68b069b0196246b4d25" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240405.002.a2-factory-84c29d00.zip" +readonly image_sha256="84c29d0025b5aa40f4c92a957cfe9851cd86df1f0778a886782db227ea667710" -readonly flash_url="https://flash.android.com/build/11583385?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11677426?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240405.002.a1-6f4658f5.zip" -readonly ota_sha256="6f4658f55493ede530444b7fecb6b7ec143da8174e283c5cf601852d761ef779" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240405.002.a2-c8d24386.zip" +readonly ota_sha256="c8d2438615763c49f69f1840b5ff1f72e2932f948d9c122ecf673d227a4500e5" readonly security_patch="2024-04-05" diff --git a/vars/husky b/vars/husky index ff0b08eb..8117a388 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240405.002.B1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r33" -readonly build_number="11480754" +readonly build_number="11677284" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240405.002-factory-e2ea86d4.zip" -readonly image_sha256="e2ea86d45a89e38e0f5e7b638896b63636beac40173d743622951abd53e15dad" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240405.002.b1-factory-d548f99d.zip" +readonly image_sha256="d548f99d9b4ad3f27f219e236df32325a7ae0c70d9151a55a470de84515b698e" -readonly flash_url="https://flash.android.com/build/11480754?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11677284?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240405.002-2c9cdda5.zip" -readonly ota_sha256="2c9cdda587b42d6e3bcac32feb4d0afd2ebd143a10511d5c3649c0b6240e31a2" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240405.002.b1-12399cf9.zip" +readonly ota_sha256="12399cf9ff3ec2ca25fd9bf6aab9dea87bfb3fccaa837f3e9193df6c1b7c94b3" readonly security_patch="2024-04-05" diff --git a/vars/lynx b/vars/lynx index d27b1a82..2189594c 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240405.002.B1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r33" -readonly build_number="11480754" +readonly build_number="11677284" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240405.002-factory-e7fe1bdf.zip" -readonly image_sha256="e7fe1bdf04fb049d1fdc5425e751dc89106b931a212134243a8ffb59c36b386d" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240405.002.b1-factory-402f306f.zip" +readonly image_sha256="402f306fdd2dc297d78d688b441dc08198d30f190de70ddbd5290ea8a108f759" -readonly flash_url="https://flash.android.com/build/11480754?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11677284?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240405.002-934b655b.zip" -readonly ota_sha256="934b655b87036f2aa6c7edf0d8769be9b9ffd1d659f97b0c17ea14da9ff0b72e" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240405.002.b1-0c41cdff.zip" +readonly ota_sha256="0c41cdff9ed097bffd4f8ed98d31523b432f486f7e4de93fa6fd9777808fbc20" readonly security_patch="2024-04-05" diff --git a/vars/panther b/vars/panther index 824cef58..d54e43e2 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240405.002.B1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r33" -readonly build_number="11480754" +readonly build_number="11677284" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240405.002-factory-d2396073.zip" -readonly image_sha256="d2396073823fec55c7aba44ba20c9ee9d83f5138be35a6ed45803772ecdb87d4" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240405.002.b1-factory-6032bf6f.zip" +readonly image_sha256="6032bf6f030b4569543a7d1fd031364f60b72c92c223e0a0b39dc969cfac79e1" -readonly flash_url="https://flash.android.com/build/11480754?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11677284?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240405.002-06b07234.zip" -readonly ota_sha256="06b072341c6d1c8c1f9179e553afc13333396637ab329947a93a2594be881470" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240405.002.b1-e5e55cca.zip" +readonly ota_sha256="e5e55cca577cfa8346e5d253052ed8afd5eb47ce0186494f271a131750a604e9" readonly security_patch="2024-04-05" diff --git a/vars/shiba b/vars/shiba index e0321f99..77542690 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240405.002.B1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r33" -readonly build_number="11480754" +readonly build_number="11677284" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240405.002-factory-ed0ea957.zip" -readonly image_sha256="ed0ea9571c072e10e0d9f2745309e90626c83eb9ab94c81c7e6f23b93348f4da" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240405.002.b1-factory-4eaef674.zip" +readonly image_sha256="4eaef674db5175d469cac315229c4027e5423e254076b5ae14bbca871437b5b0" -readonly flash_url="https://flash.android.com/build/11480754?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11677284?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240405.002-89147563.zip" -readonly ota_sha256="891475630f0fef0166f5afccb29b5fbec36fd10ccec88a2a753cf8c50aa19f75" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240405.002.b1-35a2c4d5.zip" +readonly ota_sha256="35a2c4d542c5fa48b1dd2c42484ce2bf19070ca699f6cc54a3ddebb5dbd5f0a7" readonly security_patch="2024-04-05" From 1cab4e75ec407107e3a72923f11e114b455fdd0f Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 4 Apr 2024 21:59:28 +0530 Subject: [PATCH 037/111] factory: 2cee3d4 "Remove individual flash failure exits" Change-Id: Ic4c52791adb73eff3ce697cb12320a1420430dbd --- factory/FP4/flash-all.bat | 2 +- factory/FP4/flash-all.sh | 2 +- factory/FP4/flash-base.sh | 2 +- factory/FP5/flash-all.bat | 2 +- factory/FP5/flash-all.sh | 2 +- factory/FP5/flash-base.sh | 2 +- factory/barbet/flash-all.sh | 16 ++++++++-------- factory/barbet/flash-base.sh | 16 ++++++++-------- factory/bluejay/flash-all.sh | 16 ++++++++-------- factory/bluejay/flash-base.sh | 16 ++++++++-------- factory/blueline/flash-all.sh | 16 ++++++++-------- factory/blueline/flash-base.sh | 16 ++++++++-------- factory/bonito/flash-all.sh | 16 ++++++++-------- factory/bonito/flash-base.sh | 16 ++++++++-------- factory/bramble/flash-all.sh | 16 ++++++++-------- factory/bramble/flash-base.sh | 16 ++++++++-------- factory/cheetah/flash-all.sh | 16 ++++++++-------- factory/cheetah/flash-base.sh | 16 ++++++++-------- factory/coral/flash-all.sh | 16 ++++++++-------- factory/coral/flash-base.sh | 16 ++++++++-------- factory/crosshatch/flash-all.sh | 16 ++++++++-------- factory/crosshatch/flash-base.sh | 16 ++++++++-------- factory/felix/flash-all.sh | 16 ++++++++-------- factory/felix/flash-base.sh | 16 ++++++++-------- factory/flame/flash-all.sh | 16 ++++++++-------- factory/flame/flash-base.sh | 16 ++++++++-------- factory/husky/flash-all.sh | 16 ++++++++-------- factory/husky/flash-base.sh | 16 ++++++++-------- factory/lynx/flash-all.sh | 16 ++++++++-------- factory/lynx/flash-base.sh | 16 ++++++++-------- factory/oriole/flash-all.sh | 16 ++++++++-------- factory/oriole/flash-base.sh | 16 ++++++++-------- factory/panther/flash-all.sh | 16 ++++++++-------- factory/panther/flash-base.sh | 16 ++++++++-------- factory/raven/flash-all.sh | 16 ++++++++-------- factory/raven/flash-base.sh | 16 ++++++++-------- factory/redfin/flash-all.sh | 16 ++++++++-------- factory/redfin/flash-base.sh | 16 ++++++++-------- factory/sargo/flash-all.sh | 16 ++++++++-------- factory/sargo/flash-base.sh | 16 ++++++++-------- factory/shiba/flash-all.sh | 16 ++++++++-------- factory/shiba/flash-base.sh | 16 ++++++++-------- factory/sunfish/flash-all.sh | 16 ++++++++-------- factory/sunfish/flash-base.sh | 16 ++++++++-------- factory/tangorpro/flash-all.sh | 8 ++++---- factory/tangorpro/flash-base.sh | 8 ++++---- 46 files changed, 318 insertions(+), 318 deletions(-) diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat index 76d30846..a9fb1b48 100644 --- a/factory/FP4/flash-all.bat +++ b/factory/FP4/flash-all.bat @@ -17,7 +17,7 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || exit /B 1 -fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } || exit /B 1 +fastboot flash abl_a abl.img || exit /B 1 fastboot flash abl_b abl.img || exit /B 1 fastboot flash aop_a aop.img || exit /B 1 fastboot flash aop_b aop.img || exit /B 1 diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index b2a66d50..3f610cef 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -26,7 +26,7 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_a abl.img fastboot flash abl_b abl.img fastboot flash aop_a aop.img fastboot flash aop_b aop.img diff --git a/factory/FP4/flash-base.sh b/factory/FP4/flash-base.sh index e3470063..4d9e490d 100755 --- a/factory/FP4/flash-base.sh +++ b/factory/FP4/flash-base.sh @@ -26,7 +26,7 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_a abl.img fastboot flash abl_b abl.img fastboot flash aop_a aop.img fastboot flash aop_b aop.img diff --git a/factory/FP5/flash-all.bat b/factory/FP5/flash-all.bat index 4b497705..33e99847 100644 --- a/factory/FP5/flash-all.bat +++ b/factory/FP5/flash-all.bat @@ -17,7 +17,7 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || exit /B 1 -fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } || exit /B 1 +fastboot flash abl_a abl.img || exit /B 1 fastboot flash abl_b abl.img || exit /B 1 fastboot flash aop_a aop.img || exit /B 1 fastboot flash aop_b aop.img || exit /B 1 diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh index 2733b340..93b9cdb0 100755 --- a/factory/FP5/flash-all.sh +++ b/factory/FP5/flash-all.sh @@ -26,7 +26,7 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_a abl.img fastboot flash abl_b abl.img fastboot flash aop_a aop.img fastboot flash aop_b aop.img diff --git a/factory/FP5/flash-base.sh b/factory/FP5/flash-base.sh index 96c890d3..b2a96e14 100755 --- a/factory/FP5/flash-base.sh +++ b/factory/FP5/flash-base.sh @@ -26,7 +26,7 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash abl_a abl.img || { echo 'WARNING: Use device-flasher or be sure to unlock critical to avoid bricking your device!'; exit $?; } +fastboot flash abl_a abl.img fastboot flash abl_b abl.img fastboot flash aop_a aop.img fastboot flash aop_b aop.img diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh index 4734a23e..715cf412 100755 --- a/factory/barbet/flash-all.sh +++ b/factory/barbet/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/barbet/flash-base.sh b/factory/barbet/flash-base.sh index d479db26..ad66d41c 100755 --- a/factory/barbet/flash-base.sh +++ b/factory/barbet/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh index 64fdaefb..f99d53bb 100755 --- a/factory/bluejay/flash-all.sh +++ b/factory/bluejay/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh index 764233d1..a862d9c6 100755 --- a/factory/bluejay/flash-base.sh +++ b/factory/bluejay/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/blueline/flash-all.sh b/factory/blueline/flash-all.sh index 4c36c6c0..317b849b 100755 --- a/factory/blueline/flash-all.sh +++ b/factory/blueline/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/blueline/flash-base.sh b/factory/blueline/flash-base.sh index 7697eebc..f15ed1ef 100755 --- a/factory/blueline/flash-base.sh +++ b/factory/blueline/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-blueline-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-blueline-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bonito/flash-all.sh b/factory/bonito/flash-all.sh index b34c4c3f..acf5dda0 100755 --- a/factory/bonito/flash-all.sh +++ b/factory/bonito/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bonito/flash-base.sh b/factory/bonito/flash-base.sh index e2039aa3..b9f9f433 100755 --- a/factory/bonito/flash-base.sh +++ b/factory/bonito/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bonito-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bonito-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh index d3ca8bd9..04de0c5b 100755 --- a/factory/bramble/flash-all.sh +++ b/factory/bramble/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/bramble/flash-base.sh b/factory/bramble/flash-base.sh index ad2e05d0..f1950ac7 100755 --- a/factory/bramble/flash-base.sh +++ b/factory/bramble/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-bramble-b5-0.6-10489838.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-bramble-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh index f6dde954..9eac1809 100755 --- a/factory/cheetah/flash-all.sh +++ b/factory/cheetah/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh index c3b45e8a..5be4ac12 100755 --- a/factory/cheetah/flash-base.sh +++ b/factory/cheetah/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/coral/flash-all.sh b/factory/coral/flash-all.sh index 4518ac62..5037be38 100755 --- a/factory/coral/flash-all.sh +++ b/factory/coral/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/coral/flash-base.sh b/factory/coral/flash-base.sh index f8d36c47..009dd95a 100755 --- a/factory/coral/flash-base.sh +++ b/factory/coral/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-coral-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-coral-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/crosshatch/flash-all.sh b/factory/crosshatch/flash-all.sh index 501eb607..59935525 100755 --- a/factory/crosshatch/flash-all.sh +++ b/factory/crosshatch/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/crosshatch/flash-base.sh b/factory/crosshatch/flash-base.sh index ad0eb96c..052638bd 100755 --- a/factory/crosshatch/flash-base.sh +++ b/factory/crosshatch/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-crosshatch-b1c1-0.4-7617406.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-crosshatch-g845-00194-210812-B-7635520.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh index 85379bd7..ebec2c5c 100755 --- a/factory/felix/flash-all.sh +++ b/factory/felix/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh index 2c86e29f..7f582937 100755 --- a/factory/felix/flash-base.sh +++ b/factory/felix/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/flame/flash-all.sh b/factory/flame/flash-all.sh index ee35720f..a51a1f27 100755 --- a/factory/flame/flash-all.sh +++ b/factory/flame/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/flame/flash-base.sh b/factory/flame/flash-base.sh index 1364f0fd..d6a082c0 100755 --- a/factory/flame/flash-base.sh +++ b/factory/flame/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-flame-c2f2-0.5-8906123.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-flame-g8150-00123-220708-B-8810441.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh index 1e19c47d..10901683 100755 --- a/factory/husky/flash-all.sh +++ b/factory/husky/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh index 38dfe5f9..3d0279e0 100755 --- a/factory/husky/flash-base.sh +++ b/factory/husky/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh index 8ce9226a..8d81cad9 100755 --- a/factory/lynx/flash-all.sh +++ b/factory/lynx/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh index 68850671..0dc3d47c 100755 --- a/factory/lynx/flash-base.sh +++ b/factory/lynx/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh index 6bb104e4..3a102eba 100755 --- a/factory/oriole/flash-all.sh +++ b/factory/oriole/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh index ee62af17..9f11a07e 100755 --- a/factory/oriole/flash-base.sh +++ b/factory/oriole/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh index 7b35e611..1b64756b 100755 --- a/factory/panther/flash-all.sh +++ b/factory/panther/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh index 5c9c5a2f..55fd6354 100755 --- a/factory/panther/flash-base.sh +++ b/factory/panther/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh index 78a3124c..f923841c 100755 --- a/factory/raven/flash-all.sh +++ b/factory/raven/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh index c4f11e04..8b8617d1 100755 --- a/factory/raven/flash-base.sh +++ b/factory/raven/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh index 0a6dec7b..3b711c12 100755 --- a/factory/redfin/flash-all.sh +++ b/factory/redfin/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/redfin/flash-base.sh b/factory/redfin/flash-base.sh index 9e40df6e..cdcfa918 100755 --- a/factory/redfin/flash-base.sh +++ b/factory/redfin/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-redfin-r3-0.6-10489834.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-redfin-g7250-00264-230619-B-10346159.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sargo/flash-all.sh b/factory/sargo/flash-all.sh index ac3f2531..f9f31583 100755 --- a/factory/sargo/flash-all.sh +++ b/factory/sargo/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sargo/flash-base.sh b/factory/sargo/flash-base.sh index 54d552c4..efda24be 100755 --- a/factory/sargo/flash-base.sh +++ b/factory/sargo/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sargo-b4s4-0.4-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sargo-g670-00145-220106-B-8048689.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh index 273a4389..3f640b9d 100755 --- a/factory/shiba/flash-all.sh +++ b/factory/shiba/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh index 71cf91b7..2b1ffa72 100755 --- a/factory/shiba/flash-base.sh +++ b/factory/shiba/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sunfish/flash-all.sh b/factory/sunfish/flash-all.sh index ca65cba8..1345b544 100755 --- a/factory/sunfish/flash-all.sh +++ b/factory/sunfish/flash-all.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/sunfish/flash-base.sh b/factory/sunfish/flash-base.sh index 06723df9..adf5926c 100755 --- a/factory/sunfish/flash-base.sh +++ b/factory/sunfish/flash-base.sh @@ -26,17 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-sunfish-s5-0.5-10252351.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other radio radio-sunfish-g7150-00112-230505-B-10075601.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh index 1a2fa1af..cdb400b6 100755 --- a/factory/tangorpro/flash-all.sh +++ b/factory/tangorpro/flash-all.sh @@ -26,11 +26,11 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh index 411aba2c..82a5c2c8 100755 --- a/factory/tangorpro/flash-base.sh +++ b/factory/tangorpro/flash-base.sh @@ -26,11 +26,11 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit $? -fastboot --set-active=other reboot-bootloader || exit $? +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img From d5195055ff32bbd2c5267260f504fe10af6ee93b Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 8 May 2024 00:53:21 +0530 Subject: [PATCH 038/111] May 2024 Security update Change-Id: I348f767b7176cec5019db5d189844411a9199a21 --- vars/barbet | 22 +++++++++++----------- vars/bluejay | 22 +++++++++++----------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 22 +++++++++++----------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 22 +++++++++++----------- vars/panther | 20 ++++++++++---------- vars/raven | 22 +++++++++++----------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 22 +++++++++++----------- 12 files changed, 121 insertions(+), 121 deletions(-) diff --git a/vars/barbet b/vars/barbet index d89d84c7..1ffa0cde 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240505.004" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="unknown" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r34" -readonly build_number="11480754" +readonly build_number="11583682" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240405.002-factory-79849e07.zip" -readonly image_sha256="79849e074fcb87d3cb707d3b6aab26d04eb4078c859bf15f373fa5834a338a04" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240505.004-factory-95585c7d.zip" +readonly image_sha256="95585c7d43a0d530e32901ebc947518f54924f853a8ddb8b3152b368bc36827d" -readonly flash_url="https://flash.android.com/build/11480754?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11583682?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240405.002-0865416f.zip" -readonly ota_sha256="0865416f44af26e3c2080054823c445bd44aca84f4306fc91741b43ceec8279e" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240505.004-c4841f42.zip" +readonly ota_sha256="c4841f420ce26fc507225056739b609b6a331cd7021dc6f4befd9d1d16bc0865" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/bluejay b/vars/bluejay index 0e32bb64..84db7319 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240505.004" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="unknown" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r34" -readonly build_number="11480754" +readonly build_number="11583682" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240405.002-factory-5132dfa4.zip" -readonly image_sha256="5132dfa47ab0dee84a770c71a2afb7c4234a798c735ab307634a2dc8f75aa5c9" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240505.004-factory-cceebfed.zip" +readonly image_sha256="cceebfed48417b14848ca7a7d8d6dcd883d636cd64cd02efb18710adb92bf488" -readonly flash_url="https://flash.android.com/build/11480754?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11583682?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240405.002-6114363c.zip" -readonly ota_sha256="6114363cea4102798bd7d27f3ec59ed04f45eec1901ce0c5247777a0e7b5912c" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240505.004-1170ac40.zip" +readonly ota_sha256="1170ac408f05351cc64a749b6a5dc6063f83323ed704e33845fc5297979ba035" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/cheetah b/vars/cheetah index af5e0439..05a97f9e 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.B1" +readonly build_id="AP1A.240505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r33" +readonly prev_aosp_tag="android-14.0.0_r33" +readonly aosp_tag="android-14.0.0_r35" -readonly build_number="11677284" +readonly build_number="11677807" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240405.002.b1-factory-a0b4650d.zip" -readonly image_sha256="a0b4650d7c21a96cf723acd2d128eece17204f75b0de0b81a650be02174fc15a" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240505.005-factory-4028d79c.zip" +readonly image_sha256="4028d79ca6fa66a825cd62295c078c27b7f9430b5be1a68cd87a4fb87bf4c942" -readonly flash_url="https://flash.android.com/build/11677284?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11677807?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240405.002.b1-b3deb9cf.zip" -readonly ota_sha256="b3deb9cf5f715e3d83cf1e222abc629451ffc07ef4fbc2331177303fb25d3194" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240505.005-9e6cb7d4.zip" +readonly ota_sha256="9e6cb7d4bb1bf3058306c43883ed806f63521e3777da695247b53b4a614b6249" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/common b/vars/common index 9e811c3a..23e19c9e 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr2-s2-release # Apr 2024 +readonly common_aosp_branch=android14-qpr2-s5-release # May 2024 -readonly prev_common_aosp_tag=android-14.0.0_r29 # Mar 2024, Pixel 5a - 8 -readonly common_aosp_tag=android-14.0.0_r31 # Apr 2024, Pixel Fold +readonly prev_common_aosp_tag=android-14.0.0_r31 # Apr 2024, Pixel Fold +readonly common_aosp_tag=android-14.0.0_r35 # May 2024, Pixel 8, Fold, 7a, 7 -readonly common_aosp_build_id=AP1A.240405.002.A1 # Apr 2024, Pixel Fold +readonly common_aosp_build_id=AP1A.240505.005 # May 2024, Pixel 8, Fold, 7a, 7 -readonly topic=apr24-2 +readonly topic=may24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 8399f495..f7e6dabc 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.A2" +readonly build_id="AP1A.240505.005" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-s2-release" +readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r31" -readonly aosp_tag="android-14.0.0_r32" +readonly prev_aosp_tag="android-14.0.0_r32" +readonly aosp_tag="android-14.0.0_r35" -readonly build_number="11677426" +readonly build_number="11677807" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240405.002.a2-factory-84c29d00.zip" -readonly image_sha256="84c29d0025b5aa40f4c92a957cfe9851cd86df1f0778a886782db227ea667710" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240505.005-factory-8d8d5cf5.zip" +readonly image_sha256="8d8d5cf5035a4ef62ff0b37be8011b25b0b555c350c95c22eef1674a328f8adb" -readonly flash_url="https://flash.android.com/build/11677426?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11677807?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240405.002.a2-c8d24386.zip" -readonly ota_sha256="c8d2438615763c49f69f1840b5ff1f72e2932f948d9c122ecf673d227a4500e5" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240505.005-b64a1177.zip" +readonly ota_sha256="b64a11773c934b59c2a0471c439b4ecd750b602288d7b1a2fc8128f60a2b9f6a" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/husky b/vars/husky index 8117a388..81b5487d 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.B1" +readonly build_id="AP1A.240505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r33" +readonly prev_aosp_tag="android-14.0.0_r33" +readonly aosp_tag="android-14.0.0_r35" -readonly build_number="11677284" +readonly build_number="11677807" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240405.002.b1-factory-d548f99d.zip" -readonly image_sha256="d548f99d9b4ad3f27f219e236df32325a7ae0c70d9151a55a470de84515b698e" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240505.005-factory-6fe67f4a.zip" +readonly image_sha256="6fe67f4a55f27e4b033dca50ad273aa0c2be56cc7931363292318b5531359ec1" -readonly flash_url="https://flash.android.com/build/11677284?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11677807?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240405.002.b1-12399cf9.zip" -readonly ota_sha256="12399cf9ff3ec2ca25fd9bf6aab9dea87bfb3fccaa837f3e9193df6c1b7c94b3" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240505.005-6fd4a237.zip" +readonly ota_sha256="6fd4a237bc7071482d5a28aa96c867fb2e8f133302ae853b25000b61cf82e190" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/lynx b/vars/lynx index 2189594c..bd6df9c2 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.B1" +readonly build_id="AP1A.240505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r33" +readonly prev_aosp_tag="android-14.0.0_r33" +readonly aosp_tag="android-14.0.0_r35" -readonly build_number="11677284" +readonly build_number="11677807" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240405.002.b1-factory-402f306f.zip" -readonly image_sha256="402f306fdd2dc297d78d688b441dc08198d30f190de70ddbd5290ea8a108f759" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240505.005-factory-60dc7de9.zip" +readonly image_sha256="60dc7de9d849c29e6be14e33908e4f4fd41d20ae6b9ae2cf72aeaa29a9a1c9a7" -readonly flash_url="https://flash.android.com/build/11677284?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11677807?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240405.002.b1-0c41cdff.zip" -readonly ota_sha256="0c41cdff9ed097bffd4f8ed98d31523b432f486f7e4de93fa6fd9777808fbc20" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240505.005-811cb704.zip" +readonly ota_sha256="811cb7040b1028e69f21b650684290ac32d00ef01e26a7db2c16abf59b283ceb" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/oriole b/vars/oriole index 9b1459fa..ae87eb97 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240505.004" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="unknown" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r34" -readonly build_number="11480754" +readonly build_number="11583682" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240405.002-factory-537b4123.zip" -readonly image_sha256="537b41232421841af442cd819911bfbae6cc3ed99b25289b713f1668f27c23af" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240505.004-factory-947fa39f.zip" +readonly image_sha256="947fa39f98b3651697367aead35a5b28338c139610247f82ceeb21929d7634b8" -readonly flash_url="https://flash.android.com/build/11480754?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11583682?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240405.002-bee2137c.zip" -readonly ota_sha256="bee2137c171e42a703c45215e1fbe991610b043b5fea35e31d66750f7d53f1fd" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240505.004-97dc7f29.zip" +readonly ota_sha256="97dc7f2964e41e4ee3918fdd31274546459dce8d8a9a658ba30afa087ff8262b" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/panther b/vars/panther index d54e43e2..69d327a3 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.B1" +readonly build_id="AP1A.240505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r33" +readonly prev_aosp_tag="android-14.0.0_r33" +readonly aosp_tag="android-14.0.0_r35" -readonly build_number="11677284" +readonly build_number="11677807" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240405.002.b1-factory-6032bf6f.zip" -readonly image_sha256="6032bf6f030b4569543a7d1fd031364f60b72c92c223e0a0b39dc969cfac79e1" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240505.005-factory-06b4c466.zip" +readonly image_sha256="06b4c466d240f12917055ab05bfa32c74227884416a0149944cf4706cf5afb93" -readonly flash_url="https://flash.android.com/build/11677284?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11677807?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240405.002.b1-e5e55cca.zip" -readonly ota_sha256="e5e55cca577cfa8346e5d253052ed8afd5eb47ce0186494f271a131750a604e9" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240505.005-1f3cc637.zip" +readonly ota_sha256="1f3cc6375af39e8de0fa4ef2019427d2ecd88144b24a52d5b8c3c0a0188b6363" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/raven b/vars/raven index d180c91e..0241957a 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240505.004" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="unknown" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r34" -readonly build_number="11480754" +readonly build_number="11583682" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240405.002-factory-877e050e.zip" -readonly image_sha256="877e050e15199667e97d7a07a42646f7871858b7a46d13db8dfcb74d06b419c8" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240505.004-factory-9d783215.zip" +readonly image_sha256="9d783215352ad33405210f24cdf3d6adfb6ecfdac1e23269b997ca4416c5e758" -readonly flash_url="https://flash.android.com/build/11480754?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11583682?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240405.002-4e278e46.zip" -readonly ota_sha256="4e278e46897fe3e2439ab7496d2cdf1c6308221c33f2b63c254c085be5d7d2e4" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240505.004-40c7b1f1.zip" +readonly ota_sha256="40c7b1f1c35e2407d811c34c2e3a00f636f0df05c1c2cd2ff4ade9488ea45457" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/shiba b/vars/shiba index 77542690..6f9c1fba 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002.B1" +readonly build_id="AP1A.240505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr2-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r33" +readonly prev_aosp_tag="android-14.0.0_r33" +readonly aosp_tag="android-14.0.0_r35" -readonly build_number="11677284" +readonly build_number="11677807" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240405.002.b1-factory-4eaef674.zip" -readonly image_sha256="4eaef674db5175d469cac315229c4027e5423e254076b5ae14bbca871437b5b0" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240505.005-factory-d0adedea.zip" +readonly image_sha256="d0adedeaf20b1f11e92cf89c15524a2646bd72ad96cc85fc3ceab4acb10a8923" -readonly flash_url="https://flash.android.com/build/11677284?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11677807?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240405.002.b1-35a2c4d5.zip" -readonly ota_sha256="35a2c4d542c5fa48b1dd2c42484ce2bf19070ca699f6cc54a3ddebb5dbd5f0a7" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240505.005-1ab58b6a.zip" +readonly ota_sha256="1ab58b6a5926eb8782379b0a436b4835bf6416e12bcdeb91cc07224e4fed0171" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" diff --git a/vars/tangorpro b/vars/tangorpro index 7448cf84..3776befa 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240405.002" +readonly build_id="AP1A.240505.004" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="unknown" -readonly prev_aosp_tag="android-14.0.0_r29" -readonly aosp_tag="android-14.0.0_r30" +readonly prev_aosp_tag="android-14.0.0_r30" +readonly aosp_tag="android-14.0.0_r34" -readonly build_number="11480754" +readonly build_number="11583682" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240405.002-factory-1ffdd4b2.zip" -readonly image_sha256="1ffdd4b2dbf0fa9848da9377a2615a83e5404d75c3470cd5ed5aada91314b8ab" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240505.004-factory-a49abd4c.zip" +readonly image_sha256="a49abd4c3e8992a6631ff29a9a44b14f307b6503b97791ea4ced78dede52ca35" -readonly flash_url="https://flash.android.com/build/11480754?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11583682?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240405.002-210fffed.zip" -readonly ota_sha256="210fffed45691aac7ad6a0bf2c8856c212e6c8bad8dbd9d7ac6c81cd56365aad" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240505.004-fb4a536f.zip" +readonly ota_sha256="fb4a536fb2870f9bd11fb9ec23786e6f3eb015594e206e41dae10d222d725f27" -readonly security_patch="2024-04-05" +readonly security_patch="2024-05-05" From b241b9367e4b90c0ea229a102116ed9c39ca266e Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 12 Apr 2024 19:01:10 +0530 Subject: [PATCH 039/111] factory: FP4: Update from FP4 TP2D Change-Id: I8b9cbc62da8a56e62a790d8e442e42aca6533f26 --- factory/FP4/flash-all.bat | 8 +++++++- factory/FP4/flash-all.sh | 8 +++++++- factory/FP4/flash-base.sh | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat index a9fb1b48..61e1e8ad 100644 --- a/factory/FP4/flash-all.bat +++ b/factory/FP4/flash-all.bat @@ -52,8 +52,14 @@ fastboot flash xbl_b xbl.img || exit /B 1 fastboot flash xbl_config_a xbl_config.img || exit /B 1 fastboot flash xbl_config_b xbl_config.img || exit /B 1 +fastboot flash apdp apdp.img || exit /B 1 +fastboot flash ddr ddr.img || exit /B 1 +fastboot flash logfs logfs.img || exit /B 1 +fastboot flash storsec storsec.img || exit /B 1 +fastboot flash toolsfv toolsfv.img || exit /B 1 +fastboot flash tunning tunning.img || exit /B 1 + fastboot flash frp frp.img || exit /B 1 -fastboot flash devinfo devinfo.img || exit /B 1 fastboot erase misc || exit /B 1 fastboot erase modemst1 || exit /B 1 diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index 3f610cef..defc11a7 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -61,8 +61,14 @@ fastboot flash xbl_b xbl.img fastboot flash xbl_config_a xbl_config.img fastboot flash xbl_config_b xbl_config.img +fastboot flash apdp apdp.img +fastboot flash ddr ddr.img +fastboot flash logfs logfs.img +fastboot flash storsec storsec.img +fastboot flash toolsfv toolsfv.img +fastboot flash tunning tunning.img + fastboot flash frp frp.img -fastboot flash devinfo devinfo.img fastboot erase misc fastboot erase modemst1 diff --git a/factory/FP4/flash-base.sh b/factory/FP4/flash-base.sh index 4d9e490d..f7d9a108 100755 --- a/factory/FP4/flash-base.sh +++ b/factory/FP4/flash-base.sh @@ -61,8 +61,14 @@ fastboot flash xbl_b xbl.img fastboot flash xbl_config_a xbl_config.img fastboot flash xbl_config_b xbl_config.img +fastboot flash apdp apdp.img +fastboot flash ddr ddr.img +fastboot flash logfs logfs.img +fastboot flash storsec storsec.img +fastboot flash toolsfv toolsfv.img +fastboot flash tunning tunning.img + fastboot flash frp frp.img -fastboot flash devinfo devinfo.img fastboot erase misc fastboot erase modemst1 From c8e50834c94bdc2a00c174ff402e3399a1b504d6 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 10 May 2024 18:30:18 +0300 Subject: [PATCH 040/111] vars: Pixel 8a Change-Id: Id5fa882d867ce0f66decca5c9031e35014d3da5b --- vars/akita | 32 ++++++++++++++++++++++++++++++++ vars/devices | 1 + vars/pixels | 1 + 3 files changed, 34 insertions(+) create mode 100644 vars/akita diff --git a/vars/akita b/vars/akita new file mode 100644 index 00000000..299d9a36 --- /dev/null +++ b/vars/akita @@ -0,0 +1,32 @@ +# Pixel 8a + +# Usage: ${device_repos[@]} +device_repos=( + device/google/akita + device/google/akita-sepolicy +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="UD2A.240505.001" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android14-d2-release" + +readonly prev_aosp_tag="unknown" +readonly aosp_tag="android-14.0.0_r41" + +readonly build_number="11628456" + +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ud2a.240505.001-factory-4e9bd412.zip" +readonly image_sha256="4e9bd4129a884b49d7bc9dbf304a332a8520b7a8479f2cf89d6691264db3a6eb" + +readonly flash_url="https://flash.android.com/build/11628456?target=akita-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ud2a.240505.001-47cad50f.zip" +readonly ota_sha256="47cad50fd12e845986fd32507fbb608cf889d9950f44017242d86094089d1c65" + +readonly security_patch="2024-05-05" diff --git a/vars/devices b/vars/devices index cd521c70..cfdf306e 100644 --- a/vars/devices +++ b/vars/devices @@ -1,6 +1,7 @@ # All supported devices # Usage: ${devices[@]} readonly devices=( + akita husky shiba felix diff --git a/vars/pixels b/vars/pixels index 9b0ff1a4..5498c0f9 100644 --- a/vars/pixels +++ b/vars/pixels @@ -1,6 +1,7 @@ # Google Pixels, currently supported in AOSP # Usage: ${devices[@]} readonly devices=( + akita husky shiba felix From 310908790a1eb36a93efa6b2e483a96d3b716746 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 3 Jun 2024 19:58:49 +0300 Subject: [PATCH 041/111] vars: Update FP5 to TT4D Change-Id: Ic900439a038d8170f2aec4d261408c49f360da24 --- vars/FP5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP5 b/vars/FP5 index 09332365..23146134 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.TT4C.A.154" +readonly build_id="FP5.TT4D.A.157" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT4C-factory.zip" -readonly image_sha256="4858e6e860835396b2133167e8c6ada8ad597da2d35dedb9069d59a694b0f2ba" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT4D-factory.zip" +readonly image_sha256="d47996aabded4b0b94905df653011515199e6b508bbb0049a67385a647042f87" -readonly security_patch="2024-03-05" +readonly security_patch="2024-04-05" From fb1529b017f8d21fc40dbb26ea932cb11024e2b0 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 3 Jun 2024 19:59:33 +0300 Subject: [PATCH 042/111] vars: Update FP4 to TP2G Change-Id: I4ae5ca81a17d6f550ce491252183c99923879e49 --- vars/FP4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP4 b/vars/FP4 index 6ff46185..16d9272d 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP4.TP2D.C.0112" +readonly build_id="FP4.TP2G.C.0119" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2D-factory.zip" -readonly image_sha256="c5eb86f6f4906337abe3aec896e53d0e545e90c03bc544acd12d1dee244972ea" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2G-factory.zip" +readonly image_sha256="9979a11e832a3911fbabcb3207f90560b5a4c3eab3c4a4c81267023e84d057d8" -readonly security_patch="2024-03-05" +readonly security_patch="2024-05-05" From cd1bf06ece7a4d329677e3cde956d12b21760aa8 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 11 Jun 2024 21:50:08 +0530 Subject: [PATCH 043/111] June 2024 Quarterly Platform Release and Security update Change-Id: Ibebe08159e3da45a2c94be653387955473b8de41 --- vars/akita | 22 +++++++++++----------- vars/aosp_target_release | 2 +- vars/barbet | 22 +++++++++++----------- vars/bluejay | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/common | 10 +++++----- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- 14 files changed, 138 insertions(+), 138 deletions(-) diff --git a/vars/akita b/vars/akita index 299d9a36..86c26b60 100644 --- a/vars/akita +++ b/vars/akita @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="UD2A.240505.001" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-d2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="unknown" -readonly aosp_tag="android-14.0.0_r41" +readonly prev_aosp_tag="android-14.0.0_r41" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11628456" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ud2a.240505.001-factory-4e9bd412.zip" -readonly image_sha256="4e9bd4129a884b49d7bc9dbf304a332a8520b7a8479f2cf89d6691264db3a6eb" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240605.024-factory-0023bc62.zip" +readonly image_sha256="0023bc62e4f482b89321b4e54841bdb85af6aa169c9fe87f70d009a74de15f43" -readonly flash_url="https://flash.android.com/build/11628456?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ud2a.240505.001-47cad50f.zip" -readonly ota_sha256="47cad50fd12e845986fd32507fbb608cf889d9950f44017242d86094089d1c65" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240605.024-2bc858b1.zip" +readonly ota_sha256="2bc858b188c12e33ff30ac0fa8a7dd83918a88aab0eaf42b72631f2e2fd07ef1" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/aosp_target_release b/vars/aosp_target_release index e97c6129..a595b7bd 100644 --- a/vars/aosp_target_release +++ b/vars/aosp_target_release @@ -1,2 +1,2 @@ # Updated manually -aosp_target_release=ap1a +aosp_target_release=ap2a diff --git a/vars/barbet b/vars/barbet index 1ffa0cde..6c4ac676 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.004" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="unknown" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r34" +readonly prev_aosp_tag="android-14.0.0_r34" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11583682" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240505.004-factory-95585c7d.zip" -readonly image_sha256="95585c7d43a0d530e32901ebc947518f54924f853a8ddb8b3152b368bc36827d" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240605.024-factory-5513fec5.zip" +readonly image_sha256="5513fec5a9ff962d7b4fd48c610d1c078aba9fa10728b655a7488b3e06e5f9df" -readonly flash_url="https://flash.android.com/build/11583682?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240505.004-c4841f42.zip" -readonly ota_sha256="c4841f420ce26fc507225056739b609b6a331cd7021dc6f4befd9d1d16bc0865" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240605.024-67df3baf.zip" +readonly ota_sha256="67df3bafe03880b3a1b7ff232a2abd88dfc5ed441ce6d5285967fb97ff3acd34" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/bluejay b/vars/bluejay index 84db7319..bca3e287 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.004" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="unknown" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r34" +readonly prev_aosp_tag="android-14.0.0_r34" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11583682" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240505.004-factory-cceebfed.zip" -readonly image_sha256="cceebfed48417b14848ca7a7d8d6dcd883d636cd64cd02efb18710adb92bf488" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240605.024-factory-6fcf1c35.zip" +readonly image_sha256="6fcf1c35c4456887e358ff0037b652d70021fec45c70d8025e1a1adf8e5e3a26" -readonly flash_url="https://flash.android.com/build/11583682?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240505.004-1170ac40.zip" -readonly ota_sha256="1170ac408f05351cc64a749b6a5dc6063f83323ed704e33845fc5297979ba035" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240605.024-f8a734a3.zip" +readonly ota_sha256="f8a734a35362604436aa42106343acf1c6441cb6ca60d85cf351f0ad79ddacd9" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/cheetah b/vars/cheetah index 05a97f9e..c252ed9d 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.005" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r33" -readonly aosp_tag="android-14.0.0_r35" +readonly prev_aosp_tag="android-14.0.0_r35" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11677807" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240505.005-factory-4028d79c.zip" -readonly image_sha256="4028d79ca6fa66a825cd62295c078c27b7f9430b5be1a68cd87a4fb87bf4c942" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240605.024-factory-c6156301.zip" +readonly image_sha256="c6156301f1e89954369ee42376d6f7a80d634e0046400d5fc049ac69e6630aca" -readonly flash_url="https://flash.android.com/build/11677807?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240505.005-9e6cb7d4.zip" -readonly ota_sha256="9e6cb7d4bb1bf3058306c43883ed806f63521e3777da695247b53b4a614b6249" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240605.024-feba1b34.zip" +readonly ota_sha256="feba1b3497aa29b1212d357c82d2943ba3de0a00cad33cb3c841b8037abf314b" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/common b/vars/common index 23e19c9e..34677f3e 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr2-s5-release # May 2024 +readonly common_aosp_branch=android14-qpr3-release # Jun 2024 -readonly prev_common_aosp_tag=android-14.0.0_r31 # Apr 2024, Pixel Fold -readonly common_aosp_tag=android-14.0.0_r35 # May 2024, Pixel 8, Fold, 7a, 7 +readonly prev_common_aosp_tag=android-14.0.0_r35 # May 2024, Pixel 8, Fold, 7a, 7 +readonly common_aosp_tag=android-14.0.0_r50 # Jun 2024, Pixel 5a - 8 -readonly common_aosp_build_id=AP1A.240505.005 # May 2024, Pixel 8, Fold, 7a, 7 +readonly common_aosp_build_id=AP2A.240605.024 # Jun 2024, Pixel 5a - 8 -readonly topic=may24 +readonly topic=jun24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index f7e6dabc..27b34083 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.005" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r32" -readonly aosp_tag="android-14.0.0_r35" +readonly prev_aosp_tag="android-14.0.0_r35" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11677807" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240505.005-factory-8d8d5cf5.zip" -readonly image_sha256="8d8d5cf5035a4ef62ff0b37be8011b25b0b555c350c95c22eef1674a328f8adb" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240605.024-factory-4e4456f0.zip" +readonly image_sha256="4e4456f0bffb7e5664cc6c11515a1efd64e7d57cbce40b55b8f32d4485efc3f2" -readonly flash_url="https://flash.android.com/build/11677807?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240505.005-b64a1177.zip" -readonly ota_sha256="b64a11773c934b59c2a0471c439b4ecd750b602288d7b1a2fc8128f60a2b9f6a" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240605.024-8d6257df.zip" +readonly ota_sha256="8d6257dff51ca512a6791cc5346c6a0d281e24b9fa3a7595118028be362c2043" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/husky b/vars/husky index 81b5487d..ee9f4314 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.005" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r33" -readonly aosp_tag="android-14.0.0_r35" +readonly prev_aosp_tag="android-14.0.0_r35" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11677807" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240505.005-factory-6fe67f4a.zip" -readonly image_sha256="6fe67f4a55f27e4b033dca50ad273aa0c2be56cc7931363292318b5531359ec1" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240605.024-factory-778ebf06.zip" +readonly image_sha256="778ebf063af56bd7221731d49e97eff699b29c3985d919d19b00bbc7b2bd4158" -readonly flash_url="https://flash.android.com/build/11677807?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240505.005-6fd4a237.zip" -readonly ota_sha256="6fd4a237bc7071482d5a28aa96c867fb2e8f133302ae853b25000b61cf82e190" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240605.024-1dbb127d.zip" +readonly ota_sha256="1dbb127d9fce13ffb77e5648d47cdf7e24ef19279cf55cb3499733f46f6f9939" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/lynx b/vars/lynx index bd6df9c2..bf64c3af 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.005" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r33" -readonly aosp_tag="android-14.0.0_r35" +readonly prev_aosp_tag="android-14.0.0_r35" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11677807" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240505.005-factory-60dc7de9.zip" -readonly image_sha256="60dc7de9d849c29e6be14e33908e4f4fd41d20ae6b9ae2cf72aeaa29a9a1c9a7" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240605.024-factory-00dd1f3b.zip" +readonly image_sha256="00dd1f3bf9ba140ebc378c636c214789ab2454d0403b3e7d7111f5f75d77ec71" -readonly flash_url="https://flash.android.com/build/11677807?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240505.005-811cb704.zip" -readonly ota_sha256="811cb7040b1028e69f21b650684290ac32d00ef01e26a7db2c16abf59b283ceb" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240605.024-a82ac4bb.zip" +readonly ota_sha256="a82ac4bb1e8c071073620d141b55a7b8b68c6f99a9fd68fb942c5882f61f8a41" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/oriole b/vars/oriole index ae87eb97..7b65a56f 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.004" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="unknown" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r34" +readonly prev_aosp_tag="android-14.0.0_r34" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11583682" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240505.004-factory-947fa39f.zip" -readonly image_sha256="947fa39f98b3651697367aead35a5b28338c139610247f82ceeb21929d7634b8" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240605.024-factory-11cc7d9e.zip" +readonly image_sha256="11cc7d9ec56c7c135981f5e486b951ec1a9aecafb53ecacc141ffd294c68acb3" -readonly flash_url="https://flash.android.com/build/11583682?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240505.004-97dc7f29.zip" -readonly ota_sha256="97dc7f2964e41e4ee3918fdd31274546459dce8d8a9a658ba30afa087ff8262b" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240605.024-eb45acac.zip" +readonly ota_sha256="eb45acac5b875344525f696b91c6016e376081f5722497442ecc5fdd5300bf26" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/panther b/vars/panther index 69d327a3..5b4ab37b 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.005" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r33" -readonly aosp_tag="android-14.0.0_r35" +readonly prev_aosp_tag="android-14.0.0_r35" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11677807" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240505.005-factory-06b4c466.zip" -readonly image_sha256="06b4c466d240f12917055ab05bfa32c74227884416a0149944cf4706cf5afb93" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240605.024-factory-17c9b82b.zip" +readonly image_sha256="17c9b82b277d2ae39d03695f875d80d2738b4aedebcbbeab583c00c6dcf171a1" -readonly flash_url="https://flash.android.com/build/11677807?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240505.005-1f3cc637.zip" -readonly ota_sha256="1f3cc6375af39e8de0fa4ef2019427d2ecd88144b24a52d5b8c3c0a0188b6363" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240605.024-e6aff00e.zip" +readonly ota_sha256="e6aff00ee8ad6b40b4474a8242c91bdea07f894d321cf897512e9ff0967ce7d8" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/raven b/vars/raven index 0241957a..78f14e94 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.004" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="unknown" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r34" +readonly prev_aosp_tag="android-14.0.0_r34" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11583682" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240505.004-factory-9d783215.zip" -readonly image_sha256="9d783215352ad33405210f24cdf3d6adfb6ecfdac1e23269b997ca4416c5e758" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240605.024-factory-ec9948cb.zip" +readonly image_sha256="ec9948cb9f9a6cf39a8392abe21d783ac2fadc3380de3f68663e12b3fe657c38" -readonly flash_url="https://flash.android.com/build/11583682?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240505.004-40c7b1f1.zip" -readonly ota_sha256="40c7b1f1c35e2407d811c34c2e3a00f636f0df05c1c2cd2ff4ade9488ea45457" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240605.024-9fe0dd60.zip" +readonly ota_sha256="9fe0dd60f1ef4a2e3f10cc253881f7cc5bb8226fa9664832ef8c92b6bf6761ef" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/shiba b/vars/shiba index 6f9c1fba..9f2573a5 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.005" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr2-release" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r33" -readonly aosp_tag="android-14.0.0_r35" +readonly prev_aosp_tag="android-14.0.0_r35" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11677807" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240505.005-factory-d0adedea.zip" -readonly image_sha256="d0adedeaf20b1f11e92cf89c15524a2646bd72ad96cc85fc3ceab4acb10a8923" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240605.024-factory-929fd327.zip" +readonly image_sha256="929fd327672df58305b923e701ab41bfbc4b4136beabf7799c6ada2cf3864d0e" -readonly flash_url="https://flash.android.com/build/11677807?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240505.005-1ab58b6a.zip" -readonly ota_sha256="1ab58b6a5926eb8782379b0a436b4835bf6416e12bcdeb91cc07224e4fed0171" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240605.024-dc846018.zip" +readonly ota_sha256="dc846018d36f93aa46bcbb9cd029948e33da8c00e3ea5dd7dfa41a31e8b80f91" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" diff --git a/vars/tangorpro b/vars/tangorpro index 3776befa..90e3b2a9 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP1A.240505.004" +readonly build_id="AP2A.240605.024" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="unknown" +readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r30" -readonly aosp_tag="android-14.0.0_r34" +readonly prev_aosp_tag="android-14.0.0_r34" +readonly aosp_tag="android-14.0.0_r50" -readonly build_number="11583682" +readonly build_number="11860263" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240505.004-factory-a49abd4c.zip" -readonly image_sha256="a49abd4c3e8992a6631ff29a9a44b14f307b6503b97791ea4ced78dede52ca35" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240605.024-factory-c88b8590.zip" +readonly image_sha256="c88b8590fb15646cff25173e694adbc60d61f42cc4eda3a5c2ebabfbf5484319" -readonly flash_url="https://flash.android.com/build/11583682?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11860263?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240505.004-fb4a536f.zip" -readonly ota_sha256="fb4a536fb2870f9bd11fb9ec23786e6f3eb015594e206e41dae10d222d725f27" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240605.024-1bad9975.zip" +readonly ota_sha256="1bad9975a4e932b1fb3fd21f484764513bd221a29c428652bdba53855305ed9c" -readonly security_patch="2024-05-05" +readonly security_patch="2024-06-05" From 637f89fb261e3a6c01d26a9a623413982793076d Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 20 Jun 2024 00:21:24 +0530 Subject: [PATCH 044/111] factory: prod akita-factory-24507010.zip Change-Id: I71108f746b165fb637eb1bff77ab4e62ee9dc225 --- factory/akita/flash-all.bat | 33 +++++++++++++++++++++++++++++++++ factory/akita/flash-all.sh | 36 ++++++++++++++++++++++++++++++++++++ factory/akita/flash-base.sh | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 factory/akita/flash-all.bat create mode 100755 factory/akita/flash-all.sh create mode 100755 factory/akita/flash-base.sh diff --git a/factory/akita/flash-all.bat b/factory/akita/flash-all.bat new file mode 100644 index 00000000..c5a32ba3 --- /dev/null +++ b/factory/akita/flash-all.bat @@ -0,0 +1,33 @@ +@ECHO OFF +:: Copyright 2012 The Android Open Source Project +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. + +PATH=%PATH%;"%SYSTEMROOT%\System32" +fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || echo "Factory image and device do not match. Please double check" +fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || exit /B 1 +fastboot flash bootloader bootloader-akita-akita-14.1-11556094.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot flash radio radio-akita-g5300o-240130-240217-B-11465014.img +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-akita-ud2a.240505.001.zip +fastboot reboot-bootloader +ping -n 5 127.0.0.1 >nul + +echo Press any key to exit... +pause >nul +exit diff --git a/factory/akita/flash-all.sh b/factory/akita/flash-all.sh new file mode 100755 index 00000000..859f7c72 --- /dev/null +++ b/factory/akita/flash-all.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: akita$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-akita-akita-14.1-11556094.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-akita-g5300o-240130-240217-B-11465014.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img +fastboot --skip-reboot -w update image-akita-ud2a.240505.001.zip +fastboot reboot-bootloader +sleep 5 diff --git a/factory/akita/flash-base.sh b/factory/akita/flash-base.sh new file mode 100755 index 00000000..3d0ca047 --- /dev/null +++ b/factory/akita/flash-base.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" + exit 1 +fi +fastboot getvar product 2>&1 | grep "^product: akita$" +if [ $? -ne 0 ]; then + echo "Factory image and device do not match. Please double check" + exit 1 +fi +fastboot flash bootloader bootloader-akita-akita-14.1-11556094.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-akita-g5300o-240130-240217-B-11465014.img +fastboot reboot-bootloader +sleep 5 +fastboot erase avb_custom_key +fastboot flash avb_custom_key avb_custom_key.img From 60c037efc86524441016364973147364cf3b3a07 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 20 Jun 2024 00:24:38 +0530 Subject: [PATCH 045/111] factory: regen after 5.8.1 * Mainly for akita Change-Id: Ic748b0816beb3bb7a694576565029427d0be544a --- factory/FP4/flash-all.bat | 2 +- factory/FP4/flash-all.sh | 2 +- factory/FP5/flash-all.bat | 2 +- factory/FP5/flash-all.sh | 2 +- factory/akita/flash-all.bat | 23 +++++++++++++++-------- factory/akita/flash-all.sh | 21 +++++++++++++++------ factory/akita/flash-base.sh | 19 ++++++++++++++----- factory/axolotl/flash-all.bat | 4 ++-- factory/axolotl/flash-all.sh | 4 ++-- factory/axolotl/flash-base.sh | 2 +- factory/barbet/flash-all.bat | 10 +++++----- factory/barbet/flash-all.sh | 10 +++++----- factory/barbet/flash-base.sh | 8 ++++---- factory/bluejay/flash-all.bat | 10 +++++----- factory/bluejay/flash-all.sh | 10 +++++----- factory/bluejay/flash-base.sh | 8 ++++---- factory/blueline/flash-all.bat | 2 +- factory/blueline/flash-all.sh | 2 +- factory/bonito/flash-all.bat | 2 +- factory/bonito/flash-all.sh | 2 +- factory/bramble/flash-all.bat | 2 +- factory/bramble/flash-all.sh | 2 +- factory/cheetah/flash-all.bat | 10 +++++----- factory/cheetah/flash-all.sh | 10 +++++----- factory/cheetah/flash-base.sh | 8 ++++---- factory/coral/flash-all.bat | 2 +- factory/coral/flash-all.sh | 2 +- factory/crosshatch/flash-all.bat | 2 +- factory/crosshatch/flash-all.sh | 2 +- factory/devon/flash-all.bat | 2 +- factory/devon/flash-all.sh | 2 +- factory/felix/flash-all.bat | 10 +++++----- factory/felix/flash-all.sh | 10 +++++----- factory/felix/flash-base.sh | 8 ++++---- factory/flame/flash-all.bat | 2 +- factory/flame/flash-all.sh | 2 +- factory/hawao/flash-all.bat | 2 +- factory/hawao/flash-all.sh | 2 +- factory/husky/flash-all.bat | 10 +++++----- factory/husky/flash-all.sh | 10 +++++----- factory/husky/flash-base.sh | 8 ++++---- factory/lynx/flash-all.bat | 10 +++++----- factory/lynx/flash-all.sh | 10 +++++----- factory/lynx/flash-base.sh | 8 ++++---- factory/oriole/flash-all.bat | 10 +++++----- factory/oriole/flash-all.sh | 10 +++++----- factory/oriole/flash-base.sh | 8 ++++---- factory/panther/flash-all.bat | 10 +++++----- factory/panther/flash-all.sh | 10 +++++----- factory/panther/flash-base.sh | 8 ++++---- factory/raven/flash-all.bat | 10 +++++----- factory/raven/flash-all.sh | 10 +++++----- factory/raven/flash-base.sh | 8 ++++---- factory/redfin/flash-all.bat | 2 +- factory/redfin/flash-all.sh | 2 +- factory/rhode/flash-all.bat | 2 +- factory/rhode/flash-all.sh | 2 +- factory/sargo/flash-all.bat | 2 +- factory/sargo/flash-all.sh | 2 +- factory/shiba/flash-all.bat | 10 +++++----- factory/shiba/flash-all.sh | 10 +++++----- factory/shiba/flash-base.sh | 8 ++++---- factory/sunfish/flash-all.bat | 2 +- factory/sunfish/flash-all.sh | 2 +- factory/tangorpro/flash-all.bat | 6 +++--- factory/tangorpro/flash-all.sh | 6 +++--- factory/tangorpro/flash-base.sh | 4 ++-- 67 files changed, 225 insertions(+), 200 deletions(-) diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat index 61e1e8ad..18266689 100644 --- a/factory/FP4/flash-all.bat +++ b/factory/FP4/flash-all.bat @@ -69,7 +69,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-FP4-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-FP4-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index defc11a7..5e494da9 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -78,6 +78,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-FP4-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-FP4-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/FP5/flash-all.bat b/factory/FP5/flash-all.bat index 33e99847..1d5bf23b 100644 --- a/factory/FP5/flash-all.bat +++ b/factory/FP5/flash-all.bat @@ -71,7 +71,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-FP5-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-FP5-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh index 93b9cdb0..e6396144 100755 --- a/factory/FP5/flash-all.sh +++ b/factory/FP5/flash-all.sh @@ -80,6 +80,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-FP5-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-FP5-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/akita/flash-all.bat b/factory/akita/flash-all.bat index c5a32ba3..9c6082ca 100644 --- a/factory/akita/flash-all.bat +++ b/factory/akita/flash-all.bat @@ -1,4 +1,5 @@ @ECHO OFF + :: Copyright 2012 The Android Open Source Project :: :: Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,16 +17,22 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || exit /B 1 -fastboot flash bootloader bootloader-akita-akita-14.1-11556094.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 +ping -n 5 127.0.0.1 >nul +fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash radio radio-akita-g5300o-240130-240217-B-11465014.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img || exit /B 1 +fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot erase avb_custom_key -fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-akita-ud2a.240505.001.zip -fastboot reboot-bootloader +fastboot erase avb_custom_key || exit /B 1 +fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 +fastboot --skip-reboot -w update image-akita-ap2a.240605.024.zip || exit /B 1 +fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul echo Press any key to exit... diff --git a/factory/akita/flash-all.sh b/factory/akita/flash-all.sh index 859f7c72..d436ad0c 100755 --- a/factory/akita/flash-all.sh +++ b/factory/akita/flash-all.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,14 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-akita-akita-14.1-11556094.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash radio radio-akita-g5300o-240130-240217-B-11465014.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot --set-active=other reboot-bootloader +sleep 5 +fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot --set-active=other reboot-bootloader +sleep 5 +fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-akita-ud2a.240505.001.zip +fastboot --skip-reboot -w update image-akita-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/akita/flash-base.sh b/factory/akita/flash-base.sh index 3d0ca047..84789898 100755 --- a/factory/akita/flash-base.sh +++ b/factory/akita/flash-base.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! [ $("$(which fastboot)" --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3301 ]; then +set -eu + +fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" +if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -23,11 +26,17 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash bootloader bootloader-akita-akita-14.1-11556094.img -fastboot reboot-bootloader +fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot --set-active=other reboot-bootloader +sleep 5 +fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot --set-active=other reboot-bootloader +sleep 5 +fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash radio radio-akita-g5300o-240130-240217-B-11465014.img -fastboot reboot-bootloader +fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img diff --git a/factory/axolotl/flash-all.bat b/factory/axolotl/flash-all.bat index 85963947..19d02d65 100644 --- a/factory/axolotl/flash-all.bat +++ b/factory/axolotl/flash-all.bat @@ -51,12 +51,12 @@ fastboot flash xbl_config_a xbl_config.img || exit /B 1 fastboot flash xbl_config_b xbl_config.img || exit /B 1 fastboot flash frp frp.img || exit /B 1 -fastboot flash devinfo devinfo.bin || exit /B 1 +fastboot flash devinfo devinfo.img || exit /B 1 fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 -fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-axolotl-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/axolotl/flash-all.sh b/factory/axolotl/flash-all.sh index 3e3485eb..fa6d5215 100755 --- a/factory/axolotl/flash-all.sh +++ b/factory/axolotl/flash-all.sh @@ -60,11 +60,11 @@ fastboot flash xbl_config_a xbl_config.img fastboot flash xbl_config_b xbl_config.img fastboot flash frp frp.img -fastboot flash devinfo devinfo.bin +fastboot flash devinfo devinfo.img fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key -fastboot --skip-reboot -w update image-axolotl-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-axolotl-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/axolotl/flash-base.sh b/factory/axolotl/flash-base.sh index 540c8e53..4528e88c 100755 --- a/factory/axolotl/flash-base.sh +++ b/factory/axolotl/flash-base.sh @@ -60,7 +60,7 @@ fastboot flash xbl_config_a xbl_config.img fastboot flash xbl_config_b xbl_config.img fastboot flash frp frp.img -fastboot flash devinfo devinfo.bin +fastboot flash devinfo devinfo.img fastboot --set-active=a reboot-bootloader sleep 5 diff --git a/factory/barbet/flash-all.bat b/factory/barbet/flash-all.bat index 8deeb988..366c5a67 100644 --- a/factory/barbet/flash-all.bat +++ b/factory/barbet/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: barbet" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: barbet" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-10898944.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-10898944.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit /B 1 +fastboot flash --slot=other radio radio-barbet-g7250-00299-240229-B-11514324.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img || exit /B 1 +fastboot flash --slot=other radio radio-barbet-g7250-00299-240229-B-11514324.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-barbet-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-barbet-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh index 715cf412..51b65eb6 100755 --- a/factory/barbet/flash-all.sh +++ b/factory/barbet/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-10898944.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-10898944.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot flash --slot=other radio radio-barbet-g7250-00299-240229-B-11514324.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot flash --slot=other radio radio-barbet-g7250-00299-240229-B-11514324.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-barbet-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-barbet-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/barbet/flash-base.sh b/factory/barbet/flash-base.sh index ad66d41c..1bbb839f 100755 --- a/factory/barbet/flash-base.sh +++ b/factory/barbet/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-10898944.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-11259359.img +fastboot flash --slot=other bootloader bootloader-barbet-b9-0.6-10898944.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot flash --slot=other radio radio-barbet-g7250-00299-240229-B-11514324.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-barbet-g7250-00296-231207-B-11190276.img +fastboot flash --slot=other radio radio-barbet-g7250-00299-240229-B-11514324.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/bluejay/flash-all.bat b/factory/bluejay/flash-all.bat index 1b7e5a50..e71732cf 100644 --- a/factory/bluejay/flash-all.bat +++ b/factory/bluejay/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-bluejay-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-bluejay-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh index f99d53bb..998a6d1a 100755 --- a/factory/bluejay/flash-all.sh +++ b/factory/bluejay/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bluejay-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-bluejay-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh index a862d9c6..ad9ae611 100755 --- a/factory/bluejay/flash-base.sh +++ b/factory/bluejay/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/blueline/flash-all.bat b/factory/blueline/flash-all.bat index 18301ba3..568590ee 100644 --- a/factory/blueline/flash-all.bat +++ b/factory/blueline/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-blueline-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-blueline-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/blueline/flash-all.sh b/factory/blueline/flash-all.sh index 317b849b..3fd6a093 100755 --- a/factory/blueline/flash-all.sh +++ b/factory/blueline/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-blueline-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-blueline-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/bonito/flash-all.bat b/factory/bonito/flash-all.bat index e0bae114..fbd6bc1a 100644 --- a/factory/bonito/flash-all.bat +++ b/factory/bonito/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-bonito-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-bonito-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/bonito/flash-all.sh b/factory/bonito/flash-all.sh index acf5dda0..bc0ec2ae 100755 --- a/factory/bonito/flash-all.sh +++ b/factory/bonito/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bonito-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-bonito-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/bramble/flash-all.bat b/factory/bramble/flash-all.bat index 4945b936..3b46d436 100644 --- a/factory/bramble/flash-all.bat +++ b/factory/bramble/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-bramble-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-bramble-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh index 04de0c5b..4bf5eb80 100755 --- a/factory/bramble/flash-all.sh +++ b/factory/bramble/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bramble-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-bramble-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/cheetah/flash-all.bat b/factory/cheetah/flash-all.bat index 8d585256..65bf72f7 100644 --- a/factory/cheetah/flash-all.bat +++ b/factory/cheetah/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-cheetah-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-cheetah-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh index 9eac1809..62a12e18 100755 --- a/factory/cheetah/flash-all.sh +++ b/factory/cheetah/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-cheetah-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-cheetah-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh index 5be4ac12..9d6112ed 100755 --- a/factory/cheetah/flash-base.sh +++ b/factory/cheetah/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/coral/flash-all.bat b/factory/coral/flash-all.bat index 0992392e..df881da7 100644 --- a/factory/coral/flash-all.bat +++ b/factory/coral/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-coral-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-coral-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/coral/flash-all.sh b/factory/coral/flash-all.sh index 5037be38..e395a9b4 100755 --- a/factory/coral/flash-all.sh +++ b/factory/coral/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-coral-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-coral-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/crosshatch/flash-all.bat b/factory/crosshatch/flash-all.bat index 2014387d..4c481df4 100644 --- a/factory/crosshatch/flash-all.bat +++ b/factory/crosshatch/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-crosshatch-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-crosshatch-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/crosshatch/flash-all.sh b/factory/crosshatch/flash-all.sh index 59935525..a3f927b1 100755 --- a/factory/crosshatch/flash-all.sh +++ b/factory/crosshatch/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-crosshatch-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-crosshatch-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/devon/flash-all.bat b/factory/devon/flash-all.bat index 02fb052b..b650b70b 100644 --- a/factory/devon/flash-all.bat +++ b/factory/devon/flash-all.bat @@ -66,7 +66,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-devon-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-devon-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/devon/flash-all.sh b/factory/devon/flash-all.sh index 02eed069..1dcce303 100755 --- a/factory/devon/flash-all.sh +++ b/factory/devon/flash-all.sh @@ -75,6 +75,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-devon-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-devon-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/felix/flash-all.bat b/factory/felix/flash-all.bat index 1140fb2c..ae220fb9 100644 --- a/factory/felix/flash-all.bat +++ b/factory/felix/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-felix-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-felix-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh index ebec2c5c..e8677e6f 100755 --- a/factory/felix/flash-all.sh +++ b/factory/felix/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-felix-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-felix-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh index 7f582937..067b85f1 100755 --- a/factory/felix/flash-base.sh +++ b/factory/felix/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/flame/flash-all.bat b/factory/flame/flash-all.bat index d882fe44..d2f4146b 100644 --- a/factory/flame/flash-all.bat +++ b/factory/flame/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-flame-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-flame-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/flame/flash-all.sh b/factory/flame/flash-all.sh index a51a1f27..06c5e2ee 100755 --- a/factory/flame/flash-all.sh +++ b/factory/flame/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-flame-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-flame-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/hawao/flash-all.bat b/factory/hawao/flash-all.bat index 7dd45d97..ece409a7 100644 --- a/factory/hawao/flash-all.bat +++ b/factory/hawao/flash-all.bat @@ -66,7 +66,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-hawao-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-hawao-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/hawao/flash-all.sh b/factory/hawao/flash-all.sh index c92a3c9a..cb0ebf8c 100755 --- a/factory/hawao/flash-all.sh +++ b/factory/hawao/flash-all.sh @@ -75,6 +75,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-hawao-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-hawao-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/husky/flash-all.bat b/factory/husky/flash-all.bat index 48884e8b..42be3e8e 100644 --- a/factory/husky/flash-all.bat +++ b/factory/husky/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-husky-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-husky-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh index 10901683..9e301d92 100755 --- a/factory/husky/flash-all.sh +++ b/factory/husky/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-husky-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-husky-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh index 3d0279e0..8438f83c 100755 --- a/factory/husky/flash-base.sh +++ b/factory/husky/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/lynx/flash-all.bat b/factory/lynx/flash-all.bat index 1181286f..b4e4c7c9 100644 --- a/factory/lynx/flash-all.bat +++ b/factory/lynx/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-lynx-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-lynx-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh index 8d81cad9..2a185ce4 100755 --- a/factory/lynx/flash-all.sh +++ b/factory/lynx/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-lynx-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-lynx-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh index 0dc3d47c..10db240f 100755 --- a/factory/lynx/flash-base.sh +++ b/factory/lynx/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/oriole/flash-all.bat b/factory/oriole/flash-all.bat index 23c0f6d5..4c306e33 100644 --- a/factory/oriole/flash-all.bat +++ b/factory/oriole/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-oriole-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-oriole-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh index 3a102eba..4ff19b42 100755 --- a/factory/oriole/flash-all.sh +++ b/factory/oriole/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-oriole-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-oriole-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh index 9f11a07e..c60290a5 100755 --- a/factory/oriole/flash-base.sh +++ b/factory/oriole/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-oriole-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/panther/flash-all.bat b/factory/panther/flash-all.bat index ab64ecd7..77a3a65c 100644 --- a/factory/panther/flash-all.bat +++ b/factory/panther/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-panther-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-panther-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh index 1b64756b..978575bc 100755 --- a/factory/panther/flash-all.sh +++ b/factory/panther/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-panther-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-panther-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh index 55fd6354..69afcb6f 100755 --- a/factory/panther/flash-base.sh +++ b/factory/panther/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/raven/flash-all.bat b/factory/raven/flash-all.bat index be0b3039..a0a59801 100644 --- a/factory/raven/flash-all.bat +++ b/factory/raven/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img || exit /B 1 +fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-raven-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-raven-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh index f923841c..8f0dfaa4 100755 --- a/factory/raven/flash-all.sh +++ b/factory/raven/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-raven-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-raven-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh index 8b8617d1..131f6acf 100755 --- a/factory/raven/flash-base.sh +++ b/factory/raven/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-raven-slider-1.3-11403664.img +fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-130914-240205-B-11405587.img +fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/redfin/flash-all.bat b/factory/redfin/flash-all.bat index d05cb56f..10c9b980 100644 --- a/factory/redfin/flash-all.bat +++ b/factory/redfin/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-redfin-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-redfin-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh index 3b711c12..d415363d 100755 --- a/factory/redfin/flash-all.sh +++ b/factory/redfin/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-redfin-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-redfin-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/rhode/flash-all.bat b/factory/rhode/flash-all.bat index 763e4c34..85f95216 100644 --- a/factory/rhode/flash-all.bat +++ b/factory/rhode/flash-all.bat @@ -66,7 +66,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-rhode-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-rhode-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/rhode/flash-all.sh b/factory/rhode/flash-all.sh index f7a3cf3f..a48d5945 100755 --- a/factory/rhode/flash-all.sh +++ b/factory/rhode/flash-all.sh @@ -75,6 +75,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-rhode-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-rhode-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/sargo/flash-all.bat b/factory/sargo/flash-all.bat index 1cc83578..804d9773 100644 --- a/factory/sargo/flash-all.bat +++ b/factory/sargo/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-sargo-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-sargo-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/sargo/flash-all.sh b/factory/sargo/flash-all.sh index f9f31583..310f504f 100755 --- a/factory/sargo/flash-all.sh +++ b/factory/sargo/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-sargo-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-sargo-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/shiba/flash-all.bat b/factory/shiba/flash-all.bat index f929d739..8c03b67d 100644 --- a/factory/shiba/flash-all.bat +++ b/factory/shiba/flash-all.bat @@ -17,21 +17,21 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img || exit /B 1 +fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-shiba-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-shiba-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh index 3f640b9d..880c0f01 100755 --- a/factory/shiba/flash-all.sh +++ b/factory/shiba/flash-all.sh @@ -26,20 +26,20 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-shiba-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-shiba-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh index 2b1ffa72..ade50f2a 100755 --- a/factory/shiba/flash-base.sh +++ b/factory/shiba/flash-base.sh @@ -26,16 +26,16 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.4-11403750.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-231218-240202-B-11396366.img +fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/sunfish/flash-all.bat b/factory/sunfish/flash-all.bat index e0c20244..b3bb34dd 100644 --- a/factory/sunfish/flash-all.bat +++ b/factory/sunfish/flash-all.bat @@ -31,7 +31,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-sunfish-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-sunfish-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/sunfish/flash-all.sh b/factory/sunfish/flash-all.sh index 1345b544..e3790139 100755 --- a/factory/sunfish/flash-all.sh +++ b/factory/sunfish/flash-all.sh @@ -40,6 +40,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-sunfish-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-sunfish-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/tangorpro/flash-all.bat b/factory/tangorpro/flash-all.bat index f3170e59..e63d5bfb 100644 --- a/factory/tangorpro/flash-all.bat +++ b/factory/tangorpro/flash-all.bat @@ -17,15 +17,15 @@ PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-tangorpro-ap1a.240405.002.a1.zip || exit /B 1 +fastboot --skip-reboot -w update image-tangorpro-ap2a.240605.024.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh index cdb400b6..8dda4fdd 100755 --- a/factory/tangorpro/flash-all.sh +++ b/factory/tangorpro/flash-all.sh @@ -26,14 +26,14 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-tangorpro-ap1a.240405.002.a1.zip +fastboot --skip-reboot -w update image-tangorpro-ap2a.240605.024.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh index 82a5c2c8..f1bdf1da 100755 --- a/factory/tangorpro/flash-base.sh +++ b/factory/tangorpro/flash-base.sh @@ -26,10 +26,10 @@ if [ $? -ne 0 ]; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.4-11458464.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key From 6cc9dfc903523a047fba5ebc9507cc519e7cd54b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 26 Jun 2024 10:08:02 +0300 Subject: [PATCH 046/111] vars: Update to FP5 TT4H Change-Id: Ic00084e20b4222f19c330cf0b2a0a437b4a0fb5f --- vars/FP5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP5 b/vars/FP5 index 23146134..11044df6 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.TT4D.A.157" +readonly build_id="FP5.TT4H.A.162" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT4D-factory.zip" -readonly image_sha256="d47996aabded4b0b94905df653011515199e6b508bbb0049a67385a647042f87" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT4H-factory.zip" +readonly image_sha256="38f5cded3cceca25cbf7c9d42ad664ec232a9b1446f3ae17053fe97d7110da01" -readonly security_patch="2024-04-05" +readonly security_patch="2024-06-05" From 2aeb246ae209a6226a64ea4a60040b832195bff3 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 26 Jun 2024 18:22:52 +0530 Subject: [PATCH 047/111] factory: Fix reporting of product mismatch Issue: calyxos#2467 Change-Id: I840972bf0ff97e41323b1300e2c59c978ebd388d --- factory/FP4/flash-all.sh | 3 +-- factory/FP4/flash-base.sh | 3 +-- factory/FP5/flash-all.sh | 3 +-- factory/FP5/flash-base.sh | 3 +-- factory/akita/flash-all.sh | 3 +-- factory/akita/flash-base.sh | 3 +-- factory/axolotl/flash-all.sh | 3 +-- factory/axolotl/flash-base.sh | 3 +-- factory/barbet/flash-all.sh | 3 +-- factory/barbet/flash-base.sh | 3 +-- factory/bluejay/flash-all.sh | 3 +-- factory/bluejay/flash-base.sh | 3 +-- factory/blueline/flash-all.sh | 3 +-- factory/blueline/flash-base.sh | 3 +-- factory/bonito/flash-all.sh | 3 +-- factory/bonito/flash-base.sh | 3 +-- factory/bramble/flash-all.sh | 3 +-- factory/bramble/flash-base.sh | 3 +-- factory/cheetah/flash-all.sh | 3 +-- factory/cheetah/flash-base.sh | 3 +-- factory/coral/flash-all.sh | 3 +-- factory/coral/flash-base.sh | 3 +-- factory/crosshatch/flash-all.sh | 3 +-- factory/crosshatch/flash-base.sh | 3 +-- factory/devon/flash-all.sh | 3 +-- factory/devon/flash-base.sh | 3 +-- factory/felix/flash-all.sh | 3 +-- factory/felix/flash-base.sh | 3 +-- factory/flame/flash-all.sh | 3 +-- factory/flame/flash-base.sh | 3 +-- factory/hawao/flash-all.sh | 3 +-- factory/hawao/flash-base.sh | 3 +-- factory/husky/flash-all.sh | 3 +-- factory/husky/flash-base.sh | 3 +-- factory/lynx/flash-all.sh | 3 +-- factory/lynx/flash-base.sh | 3 +-- factory/oriole/flash-all.sh | 3 +-- factory/oriole/flash-base.sh | 3 +-- factory/panther/flash-all.sh | 3 +-- factory/panther/flash-base.sh | 3 +-- factory/raven/flash-all.sh | 3 +-- factory/raven/flash-base.sh | 3 +-- factory/redfin/flash-all.sh | 3 +-- factory/redfin/flash-base.sh | 3 +-- factory/rhode/flash-all.sh | 3 +-- factory/rhode/flash-base.sh | 3 +-- factory/sargo/flash-all.sh | 3 +-- factory/sargo/flash-base.sh | 3 +-- factory/shiba/flash-all.sh | 3 +-- factory/shiba/flash-base.sh | 3 +-- factory/sunfish/flash-all.sh | 3 +-- factory/sunfish/flash-base.sh | 3 +-- factory/tangorpro/flash-all.sh | 3 +-- factory/tangorpro/flash-base.sh | 3 +-- 54 files changed, 54 insertions(+), 108 deletions(-) diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index 5e494da9..97d45626 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: FP4$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: FP4$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/FP4/flash-base.sh b/factory/FP4/flash-base.sh index f7d9a108..ebd6101b 100755 --- a/factory/FP4/flash-base.sh +++ b/factory/FP4/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: FP4$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: FP4$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh index e6396144..5c44b225 100755 --- a/factory/FP5/flash-all.sh +++ b/factory/FP5/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: FP5$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: FP5$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/FP5/flash-base.sh b/factory/FP5/flash-base.sh index b2a96e14..7f891eb5 100755 --- a/factory/FP5/flash-base.sh +++ b/factory/FP5/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: FP5$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: FP5$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/akita/flash-all.sh b/factory/akita/flash-all.sh index d436ad0c..6569de1c 100755 --- a/factory/akita/flash-all.sh +++ b/factory/akita/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: akita$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: akita$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/akita/flash-base.sh b/factory/akita/flash-base.sh index 84789898..b083dd6a 100755 --- a/factory/akita/flash-base.sh +++ b/factory/akita/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: akita$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: akita$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/axolotl/flash-all.sh b/factory/axolotl/flash-all.sh index fa6d5215..a3c1f0d9 100755 --- a/factory/axolotl/flash-all.sh +++ b/factory/axolotl/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: sdm845$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: sdm845$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/axolotl/flash-base.sh b/factory/axolotl/flash-base.sh index 4528e88c..5125d23f 100755 --- a/factory/axolotl/flash-base.sh +++ b/factory/axolotl/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: sdm845$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: sdm845$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh index 51b65eb6..b21b0054 100755 --- a/factory/barbet/flash-all.sh +++ b/factory/barbet/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: barbet$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: barbet$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/barbet/flash-base.sh b/factory/barbet/flash-base.sh index 1bbb839f..b022d770 100755 --- a/factory/barbet/flash-base.sh +++ b/factory/barbet/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: barbet$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: barbet$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh index 998a6d1a..4bdeb57d 100755 --- a/factory/bluejay/flash-all.sh +++ b/factory/bluejay/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: bluejay$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: bluejay$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh index ad9ae611..ce705806 100755 --- a/factory/bluejay/flash-base.sh +++ b/factory/bluejay/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: bluejay$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: bluejay$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/blueline/flash-all.sh b/factory/blueline/flash-all.sh index 3fd6a093..3fa74fb2 100755 --- a/factory/blueline/flash-all.sh +++ b/factory/blueline/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: blueline$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: blueline$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/blueline/flash-base.sh b/factory/blueline/flash-base.sh index f15ed1ef..e7d1afaf 100755 --- a/factory/blueline/flash-base.sh +++ b/factory/blueline/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: blueline$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: blueline$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/bonito/flash-all.sh b/factory/bonito/flash-all.sh index bc0ec2ae..ed5b2b84 100755 --- a/factory/bonito/flash-all.sh +++ b/factory/bonito/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: bonito$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: bonito$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/bonito/flash-base.sh b/factory/bonito/flash-base.sh index b9f9f433..cc71a9a9 100755 --- a/factory/bonito/flash-base.sh +++ b/factory/bonito/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: bonito$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: bonito$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh index 4bf5eb80..ca9a5a49 100755 --- a/factory/bramble/flash-all.sh +++ b/factory/bramble/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: bramble$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: bramble$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/bramble/flash-base.sh b/factory/bramble/flash-base.sh index f1950ac7..74c7ecc1 100755 --- a/factory/bramble/flash-base.sh +++ b/factory/bramble/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: bramble$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: bramble$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh index 62a12e18..732cf37a 100755 --- a/factory/cheetah/flash-all.sh +++ b/factory/cheetah/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: cheetah$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: cheetah$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh index 9d6112ed..3347c94e 100755 --- a/factory/cheetah/flash-base.sh +++ b/factory/cheetah/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: cheetah$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: cheetah$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/coral/flash-all.sh b/factory/coral/flash-all.sh index e395a9b4..95285964 100755 --- a/factory/coral/flash-all.sh +++ b/factory/coral/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: coral$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: coral$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/coral/flash-base.sh b/factory/coral/flash-base.sh index 009dd95a..959530ae 100755 --- a/factory/coral/flash-base.sh +++ b/factory/coral/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: coral$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: coral$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/crosshatch/flash-all.sh b/factory/crosshatch/flash-all.sh index a3f927b1..ea5ba769 100755 --- a/factory/crosshatch/flash-all.sh +++ b/factory/crosshatch/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: crosshatch$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: crosshatch$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/crosshatch/flash-base.sh b/factory/crosshatch/flash-base.sh index 052638bd..35063aff 100755 --- a/factory/crosshatch/flash-base.sh +++ b/factory/crosshatch/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: crosshatch$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: crosshatch$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/devon/flash-all.sh b/factory/devon/flash-all.sh index 1dcce303..ed42d36e 100755 --- a/factory/devon/flash-all.sh +++ b/factory/devon/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: devon$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: devon$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/devon/flash-base.sh b/factory/devon/flash-base.sh index 21e36259..2cbf09d6 100755 --- a/factory/devon/flash-base.sh +++ b/factory/devon/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: devon$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: devon$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh index e8677e6f..c99778d4 100755 --- a/factory/felix/flash-all.sh +++ b/factory/felix/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: felix$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: felix$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh index 067b85f1..475e4301 100755 --- a/factory/felix/flash-base.sh +++ b/factory/felix/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: felix$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: felix$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/flame/flash-all.sh b/factory/flame/flash-all.sh index 06c5e2ee..5b7ec657 100755 --- a/factory/flame/flash-all.sh +++ b/factory/flame/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: flame$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: flame$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/flame/flash-base.sh b/factory/flame/flash-base.sh index d6a082c0..5d67955d 100755 --- a/factory/flame/flash-base.sh +++ b/factory/flame/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: flame$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: flame$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/hawao/flash-all.sh b/factory/hawao/flash-all.sh index cb0ebf8c..1e652a69 100755 --- a/factory/hawao/flash-all.sh +++ b/factory/hawao/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: hawao$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: hawao$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/hawao/flash-base.sh b/factory/hawao/flash-base.sh index dde39ba2..39d93276 100755 --- a/factory/hawao/flash-base.sh +++ b/factory/hawao/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: hawao$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: hawao$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh index 9e301d92..69e1511c 100755 --- a/factory/husky/flash-all.sh +++ b/factory/husky/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: husky$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: husky$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh index 8438f83c..8be71ab3 100755 --- a/factory/husky/flash-base.sh +++ b/factory/husky/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: husky$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: husky$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh index 2a185ce4..4b0419d8 100755 --- a/factory/lynx/flash-all.sh +++ b/factory/lynx/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: lynx$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: lynx$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh index 10db240f..558956b7 100755 --- a/factory/lynx/flash-base.sh +++ b/factory/lynx/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: lynx$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: lynx$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh index 4ff19b42..0cabc3bc 100755 --- a/factory/oriole/flash-all.sh +++ b/factory/oriole/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: oriole$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: oriole$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh index c60290a5..c7082a8d 100755 --- a/factory/oriole/flash-base.sh +++ b/factory/oriole/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: oriole$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: oriole$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh index 978575bc..15d09685 100755 --- a/factory/panther/flash-all.sh +++ b/factory/panther/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: panther$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: panther$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh index 69afcb6f..669878ee 100755 --- a/factory/panther/flash-base.sh +++ b/factory/panther/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: panther$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: panther$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh index 8f0dfaa4..a4ffd49c 100755 --- a/factory/raven/flash-all.sh +++ b/factory/raven/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: raven$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: raven$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh index 131f6acf..43c3fbf9 100755 --- a/factory/raven/flash-base.sh +++ b/factory/raven/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: raven$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: raven$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh index d415363d..3dea2b4c 100755 --- a/factory/redfin/flash-all.sh +++ b/factory/redfin/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: redfin$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: redfin$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/redfin/flash-base.sh b/factory/redfin/flash-base.sh index cdcfa918..dd0c14c0 100755 --- a/factory/redfin/flash-base.sh +++ b/factory/redfin/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: redfin$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: redfin$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/rhode/flash-all.sh b/factory/rhode/flash-all.sh index a48d5945..7f489fcb 100755 --- a/factory/rhode/flash-all.sh +++ b/factory/rhode/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: rhode$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: rhode$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/rhode/flash-base.sh b/factory/rhode/flash-base.sh index 70dac78a..865ee41a 100755 --- a/factory/rhode/flash-base.sh +++ b/factory/rhode/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: rhode$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: rhode$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/sargo/flash-all.sh b/factory/sargo/flash-all.sh index 310f504f..90766e40 100755 --- a/factory/sargo/flash-all.sh +++ b/factory/sargo/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: sargo$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: sargo$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/sargo/flash-base.sh b/factory/sargo/flash-base.sh index efda24be..fed6e713 100755 --- a/factory/sargo/flash-base.sh +++ b/factory/sargo/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: sargo$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: sargo$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh index 880c0f01..f29bd235 100755 --- a/factory/shiba/flash-all.sh +++ b/factory/shiba/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: shiba$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: shiba$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh index ade50f2a..b8c6d7d8 100755 --- a/factory/shiba/flash-base.sh +++ b/factory/shiba/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: shiba$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: shiba$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/sunfish/flash-all.sh b/factory/sunfish/flash-all.sh index e3790139..243802c4 100755 --- a/factory/sunfish/flash-all.sh +++ b/factory/sunfish/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: sunfish$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: sunfish$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/sunfish/flash-base.sh b/factory/sunfish/flash-base.sh index adf5926c..f53d64cd 100755 --- a/factory/sunfish/flash-base.sh +++ b/factory/sunfish/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: sunfish$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: sunfish$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh index 8dda4fdd..31f24388 100755 --- a/factory/tangorpro/flash-all.sh +++ b/factory/tangorpro/flash-all.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: tangorpro$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: tangorpro$"; then echo "Factory image and device do not match. Please double check" exit 1 fi diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh index f1bdf1da..e2d99053 100755 --- a/factory/tangorpro/flash-base.sh +++ b/factory/tangorpro/flash-base.sh @@ -21,8 +21,7 @@ if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi -fastboot getvar product 2>&1 | grep "^product: tangorpro$" -if [ $? -ne 0 ]; then +if ! fastboot getvar product 2>&1 | grep "^product: tangorpro$"; then echo "Factory image and device do not match. Please double check" exit 1 fi From 99b95d96a1cfd6d4e40d60bb5a4535cc7af52c99 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 3 Jul 2024 02:15:43 +0530 Subject: [PATCH 048/111] July 2024 Security update Change-Id: I7a1066d9429377a82ec3ce64a4ca21ed77797dc6 --- vars/akita | 20 ++++++++++---------- vars/barbet | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 13 files changed, 125 insertions(+), 125 deletions(-) diff --git a/vars/akita b/vars/akita index 86c26b60..ed522532 100644 --- a/vars/akita +++ b/vars/akita @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r41" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r53" -readonly build_number="11860263" +readonly build_number="11942872" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240605.024-factory-0023bc62.zip" -readonly image_sha256="0023bc62e4f482b89321b4e54841bdb85af6aa169c9fe87f70d009a74de15f43" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240705.005-factory-df5f07ce.zip" +readonly image_sha256="df5f07ce1bb72f1c3802178aa367c5d21cedbbc46fd34adbc9d9a09baf4bd1e0" -readonly flash_url="https://flash.android.com/build/11860263?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/11942872?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240605.024-2bc858b1.zip" -readonly ota_sha256="2bc858b188c12e33ff30ac0fa8a7dd83918a88aab0eaf42b72631f2e2fd07ef1" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240705.005-fbd833f2.zip" +readonly ota_sha256="fbd833f292ff08e0ca173644a11181f5395082729f5ae2730e47ba85778c811a" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/barbet b/vars/barbet index 6c4ac676..ea22cdfd 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r34" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240605.024-factory-5513fec5.zip" -readonly image_sha256="5513fec5a9ff962d7b4fd48c610d1c078aba9fa10728b655a7488b3e06e5f9df" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240705.004-factory-05919506.zip" +readonly image_sha256="05919506813ec8d26dba3c0ac1d300ec33d981ce6836efb077f5cd4df736e2e9" -readonly flash_url="https://flash.android.com/build/11860263?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240605.024-67df3baf.zip" -readonly ota_sha256="67df3bafe03880b3a1b7ff232a2abd88dfc5ed441ce6d5285967fb97ff3acd34" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240705.004-59dbe024.zip" +readonly ota_sha256="59dbe0243117258adad890e304134fc45d19314f6fd87cf4fe7a620576c59a49" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/bluejay b/vars/bluejay index bca3e287..495ed009 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r34" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240605.024-factory-6fcf1c35.zip" -readonly image_sha256="6fcf1c35c4456887e358ff0037b652d70021fec45c70d8025e1a1adf8e5e3a26" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240705.004-factory-22c92bf8.zip" +readonly image_sha256="22c92bf8909f5004dfcf9e89c7b1d22acd2cefe85719a40c8e0bac212a4ce8be" -readonly flash_url="https://flash.android.com/build/11860263?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240605.024-f8a734a3.zip" -readonly ota_sha256="f8a734a35362604436aa42106343acf1c6441cb6ca60d85cf351f0ad79ddacd9" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240705.004-0b2bc993.zip" +readonly ota_sha256="0b2bc993977cc222071cdf8f01be037fdfa106064b53225ec1c9d96692c04c91" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/cheetah b/vars/cheetah index c252ed9d..acf90b55 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r35" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240605.024-factory-c6156301.zip" -readonly image_sha256="c6156301f1e89954369ee42376d6f7a80d634e0046400d5fc049ac69e6630aca" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240705.004-factory-f5dae343.zip" +readonly image_sha256="f5dae3433976125e761dc29de23e5dfeaca934431e2f7b9ae68429454cd74a8b" -readonly flash_url="https://flash.android.com/build/11860263?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240605.024-feba1b34.zip" -readonly ota_sha256="feba1b3497aa29b1212d357c82d2943ba3de0a00cad33cb3c841b8037abf314b" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240705.004-6c6f1111.zip" +readonly ota_sha256="6c6f1111c59504327286bf5097db74a1492d519d0abab80f40938f999c6d8144" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/common b/vars/common index 34677f3e..6696b828 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr3-release # Jun 2024 +readonly common_aosp_branch=android14-qpr3-release # Jul 2024 -readonly prev_common_aosp_tag=android-14.0.0_r35 # May 2024, Pixel 8, Fold, 7a, 7 -readonly common_aosp_tag=android-14.0.0_r50 # Jun 2024, Pixel 5a - 8 +readonly prev_common_aosp_tag=android-14.0.0_r50 # Jun 2024, Pixel 5a - 8 +readonly common_aosp_tag=android-14.0.0_r53 # Jul 2024, Pixel 8 -readonly common_aosp_build_id=AP2A.240605.024 # Jun 2024, Pixel 5a - 8 +readonly common_aosp_build_id=AP2A.240705.005 # Jul 2024, Pixel 8 -readonly topic=jun24 +readonly topic=jul24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 27b34083..1dff65ed 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r35" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240605.024-factory-4e4456f0.zip" -readonly image_sha256="4e4456f0bffb7e5664cc6c11515a1efd64e7d57cbce40b55b8f32d4485efc3f2" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240705.004-factory-390a81d8.zip" +readonly image_sha256="390a81d826378ff26d62fa2219170d542b75955bdd490a23290b5afed1a59b11" -readonly flash_url="https://flash.android.com/build/11860263?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240605.024-8d6257df.zip" -readonly ota_sha256="8d6257dff51ca512a6791cc5346c6a0d281e24b9fa3a7595118028be362c2043" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240705.004-331b80dd.zip" +readonly ota_sha256="331b80dd51828e94782f4d7d1f57001706a9387547c597f373736a8fd3b421c9" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/husky b/vars/husky index ee9f4314..a5935f34 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r35" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r53" -readonly build_number="11860263" +readonly build_number="11942872" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240605.024-factory-778ebf06.zip" -readonly image_sha256="778ebf063af56bd7221731d49e97eff699b29c3985d919d19b00bbc7b2bd4158" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240705.005-factory-5cd8df1e.zip" +readonly image_sha256="5cd8df1e27039b3af10e38247666839af30fb5eb598f4fb8730beb563c44d108" -readonly flash_url="https://flash.android.com/build/11860263?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/11942872?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240605.024-1dbb127d.zip" -readonly ota_sha256="1dbb127d9fce13ffb77e5648d47cdf7e24ef19279cf55cb3499733f46f6f9939" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240705.005-53506844.zip" +readonly ota_sha256="5350684479678128191ffc5e79e7effff5b8913f3e7291b407f5adbdd16de011" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/lynx b/vars/lynx index bf64c3af..3efc729e 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r35" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240605.024-factory-00dd1f3b.zip" -readonly image_sha256="00dd1f3bf9ba140ebc378c636c214789ab2454d0403b3e7d7111f5f75d77ec71" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240705.004-factory-ca59166f.zip" +readonly image_sha256="ca59166f1987ed33d85c48b832777d3fa7f37b1b5f64b4beea6363ae487471eb" -readonly flash_url="https://flash.android.com/build/11860263?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240605.024-a82ac4bb.zip" -readonly ota_sha256="a82ac4bb1e8c071073620d141b55a7b8b68c6f99a9fd68fb942c5882f61f8a41" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240705.004-89bce1b6.zip" +readonly ota_sha256="89bce1b6943cacd8d975214350e66549ca7739c924bfc9626ed3c62846ae7c6e" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/oriole b/vars/oriole index 7b65a56f..b569ac5c 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r34" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240605.024-factory-11cc7d9e.zip" -readonly image_sha256="11cc7d9ec56c7c135981f5e486b951ec1a9aecafb53ecacc141ffd294c68acb3" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240705.004-factory-bbe3b936.zip" +readonly image_sha256="bbe3b936292ba0cedff1f8074bff89d8bc2206ccb01c325967748bb028a847d4" -readonly flash_url="https://flash.android.com/build/11860263?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240605.024-eb45acac.zip" -readonly ota_sha256="eb45acac5b875344525f696b91c6016e376081f5722497442ecc5fdd5300bf26" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240705.004-0fe0567d.zip" +readonly ota_sha256="0fe0567d7f6c0144a4050c62004222f02e17c6cab401bee29c378fb7c8440de9" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/panther b/vars/panther index 5b4ab37b..bc00526a 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r35" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240605.024-factory-17c9b82b.zip" -readonly image_sha256="17c9b82b277d2ae39d03695f875d80d2738b4aedebcbbeab583c00c6dcf171a1" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240705.004-factory-42a1bfe9.zip" +readonly image_sha256="42a1bfe94a30f3cb2c37e0c268c06bbe0ea9fadb49ee1ade88b0352d85708fc0" -readonly flash_url="https://flash.android.com/build/11860263?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240605.024-e6aff00e.zip" -readonly ota_sha256="e6aff00ee8ad6b40b4474a8242c91bdea07f894d321cf897512e9ff0967ce7d8" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240705.004-5ce14c35.zip" +readonly ota_sha256="5ce14c350d8eabe92e844d25473446a01f39688c0d14001fff10ef3631e1a8ab" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/raven b/vars/raven index 78f14e94..d10b92f6 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r34" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240605.024-factory-ec9948cb.zip" -readonly image_sha256="ec9948cb9f9a6cf39a8392abe21d783ac2fadc3380de3f68663e12b3fe657c38" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240705.004-factory-02dd665c.zip" +readonly image_sha256="02dd665c4dbcca60084d2f04b4a4ea85f7c374217a7443f203a899f7a6bc01c3" -readonly flash_url="https://flash.android.com/build/11860263?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240605.024-9fe0dd60.zip" -readonly ota_sha256="9fe0dd60f1ef4a2e3f10cc253881f7cc5bb8226fa9664832ef8c92b6bf6761ef" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240705.004-f958fe50.zip" +readonly ota_sha256="f958fe502a5c006a15d9c865ab01ba222d7edbfa80a7d14a9e4861b2c61633a4" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/shiba b/vars/shiba index 9f2573a5..45e0ea5c 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r35" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r53" -readonly build_number="11860263" +readonly build_number="11942872" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240605.024-factory-929fd327.zip" -readonly image_sha256="929fd327672df58305b923e701ab41bfbc4b4136beabf7799c6ada2cf3864d0e" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240705.005-factory-461aa7c8.zip" +readonly image_sha256="461aa7c8a7834b429a73d50154ee194e7c22a2bdfa5fde417dc9c8b6c18dd91d" -readonly flash_url="https://flash.android.com/build/11860263?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/11942872?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240605.024-dc846018.zip" -readonly ota_sha256="dc846018d36f93aa46bcbb9cd029948e33da8c00e3ea5dd7dfa41a31e8b80f91" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240705.005-3376b945.zip" +readonly ota_sha256="3376b945e3769c3b90b8a5715b66b5a12be7bbd68151b7b1c303079ce8f3e719" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" diff --git a/vars/tangorpro b/vars/tangorpro index 90e3b2a9..7bf5caee 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240605.024" +readonly build_id="AP2A.240705.004" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r34" -readonly aosp_tag="android-14.0.0_r50" +readonly prev_aosp_tag="android-14.0.0_r50" +readonly aosp_tag="android-14.0.0_r52" -readonly build_number="11860263" +readonly build_number="11875680" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240605.024-factory-c88b8590.zip" -readonly image_sha256="c88b8590fb15646cff25173e694adbc60d61f42cc4eda3a5c2ebabfbf5484319" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240705.004-factory-f096bbe3.zip" +readonly image_sha256="f096bbe33013abfd3f6759a317f959a79efc7530011810857d2ab33c0f98114a" -readonly flash_url="https://flash.android.com/build/11860263?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/11875680?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240605.024-1bad9975.zip" -readonly ota_sha256="1bad9975a4e932b1fb3fd21f484764513bd221a29c428652bdba53855305ed9c" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240705.004-e9472688.zip" +readonly ota_sha256="e94726886f4d0b2462159a1160d37f113ab808a871369559b41b88b00b40ac5d" -readonly security_patch="2024-06-05" +readonly security_patch="2024-07-05" From 8e8c9b6f6961f3ed03703512fbb5f365ee3c8746 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 29 Jun 2024 06:00:29 +0530 Subject: [PATCH 049/111] factory: 7613ddd "Recommend using device-flasher" Change-Id: Ie3709ea7a47c347f397e5d7a3d92540cd7b1fce8 --- factory/FP4/flash-all.bat | 2 ++ factory/FP4/flash-all.sh | 7 +++++++ factory/FP4/flash-base.sh | 7 +++++++ factory/FP5/flash-all.bat | 2 ++ factory/FP5/flash-all.sh | 7 +++++++ factory/FP5/flash-base.sh | 7 +++++++ factory/akita/flash-all.bat | 2 ++ factory/akita/flash-all.sh | 7 +++++++ factory/akita/flash-base.sh | 7 +++++++ factory/axolotl/flash-all.bat | 2 ++ factory/axolotl/flash-all.sh | 7 +++++++ factory/axolotl/flash-base.sh | 7 +++++++ factory/barbet/flash-all.bat | 2 ++ factory/barbet/flash-all.sh | 7 +++++++ factory/barbet/flash-base.sh | 7 +++++++ factory/bluejay/flash-all.bat | 2 ++ factory/bluejay/flash-all.sh | 7 +++++++ factory/bluejay/flash-base.sh | 7 +++++++ factory/blueline/flash-all.bat | 2 ++ factory/blueline/flash-all.sh | 7 +++++++ factory/blueline/flash-base.sh | 7 +++++++ factory/bonito/flash-all.bat | 2 ++ factory/bonito/flash-all.sh | 7 +++++++ factory/bonito/flash-base.sh | 7 +++++++ factory/bramble/flash-all.bat | 2 ++ factory/bramble/flash-all.sh | 7 +++++++ factory/bramble/flash-base.sh | 7 +++++++ factory/cheetah/flash-all.bat | 2 ++ factory/cheetah/flash-all.sh | 7 +++++++ factory/cheetah/flash-base.sh | 7 +++++++ factory/coral/flash-all.bat | 2 ++ factory/coral/flash-all.sh | 7 +++++++ factory/coral/flash-base.sh | 7 +++++++ factory/crosshatch/flash-all.bat | 2 ++ factory/crosshatch/flash-all.sh | 7 +++++++ factory/crosshatch/flash-base.sh | 7 +++++++ factory/devon/flash-all.bat | 2 ++ factory/devon/flash-all.sh | 7 +++++++ factory/devon/flash-base.sh | 7 +++++++ factory/felix/flash-all.bat | 2 ++ factory/felix/flash-all.sh | 7 +++++++ factory/felix/flash-base.sh | 7 +++++++ factory/flame/flash-all.bat | 2 ++ factory/flame/flash-all.sh | 7 +++++++ factory/flame/flash-base.sh | 7 +++++++ factory/hawao/flash-all.bat | 2 ++ factory/hawao/flash-all.sh | 7 +++++++ factory/hawao/flash-base.sh | 7 +++++++ factory/husky/flash-all.bat | 2 ++ factory/husky/flash-all.sh | 7 +++++++ factory/husky/flash-base.sh | 7 +++++++ factory/lynx/flash-all.bat | 2 ++ factory/lynx/flash-all.sh | 7 +++++++ factory/lynx/flash-base.sh | 7 +++++++ factory/oriole/flash-all.bat | 2 ++ factory/oriole/flash-all.sh | 7 +++++++ factory/oriole/flash-base.sh | 7 +++++++ factory/panther/flash-all.bat | 2 ++ factory/panther/flash-all.sh | 7 +++++++ factory/panther/flash-base.sh | 7 +++++++ factory/raven/flash-all.bat | 2 ++ factory/raven/flash-all.sh | 7 +++++++ factory/raven/flash-base.sh | 7 +++++++ factory/redfin/flash-all.bat | 2 ++ factory/redfin/flash-all.sh | 7 +++++++ factory/redfin/flash-base.sh | 7 +++++++ factory/rhode/flash-all.bat | 2 ++ factory/rhode/flash-all.sh | 7 +++++++ factory/rhode/flash-base.sh | 7 +++++++ factory/sargo/flash-all.bat | 2 ++ factory/sargo/flash-all.sh | 7 +++++++ factory/sargo/flash-base.sh | 7 +++++++ factory/shiba/flash-all.bat | 2 ++ factory/shiba/flash-all.sh | 7 +++++++ factory/shiba/flash-base.sh | 7 +++++++ factory/sunfish/flash-all.bat | 2 ++ factory/sunfish/flash-all.sh | 7 +++++++ factory/sunfish/flash-base.sh | 7 +++++++ factory/tangorpro/flash-all.bat | 2 ++ factory/tangorpro/flash-all.sh | 7 +++++++ factory/tangorpro/flash-base.sh | 7 +++++++ 81 files changed, 432 insertions(+) diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat index 18266689..449f94b4 100644 --- a/factory/FP4/flash-all.bat +++ b/factory/FP4/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP4" || exit /B 1 diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index 97d45626..dd3794b0 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/FP4/flash-base.sh b/factory/FP4/flash-base.sh index ebd6101b..4caf06d7 100755 --- a/factory/FP4/flash-base.sh +++ b/factory/FP4/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/FP5/flash-all.bat b/factory/FP5/flash-all.bat index 1d5bf23b..1f191f5a 100644 --- a/factory/FP5/flash-all.bat +++ b/factory/FP5/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: FP5" || exit /B 1 diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh index 5c44b225..4c7e68f7 100755 --- a/factory/FP5/flash-all.sh +++ b/factory/FP5/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/FP5/flash-base.sh b/factory/FP5/flash-base.sh index 7f891eb5..7ffa8d23 100755 --- a/factory/FP5/flash-base.sh +++ b/factory/FP5/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/akita/flash-all.bat b/factory/akita/flash-all.bat index 9c6082ca..26e44ece 100644 --- a/factory/akita/flash-all.bat +++ b/factory/akita/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || exit /B 1 diff --git a/factory/akita/flash-all.sh b/factory/akita/flash-all.sh index 6569de1c..42655787 100755 --- a/factory/akita/flash-all.sh +++ b/factory/akita/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/akita/flash-base.sh b/factory/akita/flash-base.sh index b083dd6a..c2233ff8 100755 --- a/factory/akita/flash-base.sh +++ b/factory/akita/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/axolotl/flash-all.bat b/factory/axolotl/flash-all.bat index 19d02d65..44597df0 100644 --- a/factory/axolotl/flash-all.bat +++ b/factory/axolotl/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: sdm845" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: sdm845" || exit /B 1 diff --git a/factory/axolotl/flash-all.sh b/factory/axolotl/flash-all.sh index a3c1f0d9..ad38e44b 100755 --- a/factory/axolotl/flash-all.sh +++ b/factory/axolotl/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/axolotl/flash-base.sh b/factory/axolotl/flash-base.sh index 5125d23f..8a9072e3 100755 --- a/factory/axolotl/flash-base.sh +++ b/factory/axolotl/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/barbet/flash-all.bat b/factory/barbet/flash-all.bat index 366c5a67..2506cf47 100644 --- a/factory/barbet/flash-all.bat +++ b/factory/barbet/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: barbet" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: barbet" || exit /B 1 diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh index b21b0054..a6b1499d 100755 --- a/factory/barbet/flash-all.sh +++ b/factory/barbet/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/barbet/flash-base.sh b/factory/barbet/flash-base.sh index b022d770..7524ec32 100755 --- a/factory/barbet/flash-base.sh +++ b/factory/barbet/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/bluejay/flash-all.bat b/factory/bluejay/flash-all.bat index e71732cf..70132b90 100644 --- a/factory/bluejay/flash-all.bat +++ b/factory/bluejay/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || exit /B 1 diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh index 4bdeb57d..0990b0b3 100755 --- a/factory/bluejay/flash-all.sh +++ b/factory/bluejay/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh index ce705806..27ede601 100755 --- a/factory/bluejay/flash-base.sh +++ b/factory/bluejay/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/blueline/flash-all.bat b/factory/blueline/flash-all.bat index 568590ee..bbf4bc73 100644 --- a/factory/blueline/flash-all.bat +++ b/factory/blueline/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: blueline" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: blueline" || exit /B 1 diff --git a/factory/blueline/flash-all.sh b/factory/blueline/flash-all.sh index 3fa74fb2..1d16a47b 100755 --- a/factory/blueline/flash-all.sh +++ b/factory/blueline/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/blueline/flash-base.sh b/factory/blueline/flash-base.sh index e7d1afaf..c64fb8a1 100755 --- a/factory/blueline/flash-base.sh +++ b/factory/blueline/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/bonito/flash-all.bat b/factory/bonito/flash-all.bat index fbd6bc1a..d21f0fdd 100644 --- a/factory/bonito/flash-all.bat +++ b/factory/bonito/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: bonito" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: bonito" || exit /B 1 diff --git a/factory/bonito/flash-all.sh b/factory/bonito/flash-all.sh index ed5b2b84..43783998 100755 --- a/factory/bonito/flash-all.sh +++ b/factory/bonito/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/bonito/flash-base.sh b/factory/bonito/flash-base.sh index cc71a9a9..758f2c14 100755 --- a/factory/bonito/flash-base.sh +++ b/factory/bonito/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/bramble/flash-all.bat b/factory/bramble/flash-all.bat index 3b46d436..470130e1 100644 --- a/factory/bramble/flash-all.bat +++ b/factory/bramble/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: bramble" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: bramble" || exit /B 1 diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh index ca9a5a49..2ddcfdb8 100755 --- a/factory/bramble/flash-all.sh +++ b/factory/bramble/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/bramble/flash-base.sh b/factory/bramble/flash-base.sh index 74c7ecc1..aba21495 100755 --- a/factory/bramble/flash-base.sh +++ b/factory/bramble/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/cheetah/flash-all.bat b/factory/cheetah/flash-all.bat index 65bf72f7..92c424fa 100644 --- a/factory/cheetah/flash-all.bat +++ b/factory/cheetah/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || exit /B 1 diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh index 732cf37a..aeb6ec04 100755 --- a/factory/cheetah/flash-all.sh +++ b/factory/cheetah/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh index 3347c94e..01cc390a 100755 --- a/factory/cheetah/flash-base.sh +++ b/factory/cheetah/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/coral/flash-all.bat b/factory/coral/flash-all.bat index df881da7..abc2d519 100644 --- a/factory/coral/flash-all.bat +++ b/factory/coral/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: coral" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: coral" || exit /B 1 diff --git a/factory/coral/flash-all.sh b/factory/coral/flash-all.sh index 95285964..1ea650e7 100755 --- a/factory/coral/flash-all.sh +++ b/factory/coral/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/coral/flash-base.sh b/factory/coral/flash-base.sh index 959530ae..bf61eea2 100755 --- a/factory/coral/flash-base.sh +++ b/factory/coral/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/crosshatch/flash-all.bat b/factory/crosshatch/flash-all.bat index 4c481df4..05209c41 100644 --- a/factory/crosshatch/flash-all.bat +++ b/factory/crosshatch/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: crosshatch" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: crosshatch" || exit /B 1 diff --git a/factory/crosshatch/flash-all.sh b/factory/crosshatch/flash-all.sh index ea5ba769..452c8d49 100755 --- a/factory/crosshatch/flash-all.sh +++ b/factory/crosshatch/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/crosshatch/flash-base.sh b/factory/crosshatch/flash-base.sh index 35063aff..4f38654c 100755 --- a/factory/crosshatch/flash-base.sh +++ b/factory/crosshatch/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/devon/flash-all.bat b/factory/devon/flash-all.bat index b650b70b..e87e8500 100644 --- a/factory/devon/flash-all.bat +++ b/factory/devon/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: devon" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: devon" || exit /B 1 diff --git a/factory/devon/flash-all.sh b/factory/devon/flash-all.sh index ed42d36e..901ba873 100755 --- a/factory/devon/flash-all.sh +++ b/factory/devon/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/devon/flash-base.sh b/factory/devon/flash-base.sh index 2cbf09d6..f8283ca4 100755 --- a/factory/devon/flash-base.sh +++ b/factory/devon/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/felix/flash-all.bat b/factory/felix/flash-all.bat index ae220fb9..7df3cbf6 100644 --- a/factory/felix/flash-all.bat +++ b/factory/felix/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || exit /B 1 diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh index c99778d4..5885f1bd 100755 --- a/factory/felix/flash-all.sh +++ b/factory/felix/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh index 475e4301..240f728a 100755 --- a/factory/felix/flash-base.sh +++ b/factory/felix/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/flame/flash-all.bat b/factory/flame/flash-all.bat index d2f4146b..8a216a13 100644 --- a/factory/flame/flash-all.bat +++ b/factory/flame/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: flame" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: flame" || exit /B 1 diff --git a/factory/flame/flash-all.sh b/factory/flame/flash-all.sh index 5b7ec657..0d704e51 100755 --- a/factory/flame/flash-all.sh +++ b/factory/flame/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/flame/flash-base.sh b/factory/flame/flash-base.sh index 5d67955d..d41e12b6 100755 --- a/factory/flame/flash-base.sh +++ b/factory/flame/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/hawao/flash-all.bat b/factory/hawao/flash-all.bat index ece409a7..088893f0 100644 --- a/factory/hawao/flash-all.bat +++ b/factory/hawao/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: hawao" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: hawao" || exit /B 1 diff --git a/factory/hawao/flash-all.sh b/factory/hawao/flash-all.sh index 1e652a69..2f6e3681 100755 --- a/factory/hawao/flash-all.sh +++ b/factory/hawao/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/hawao/flash-base.sh b/factory/hawao/flash-base.sh index 39d93276..90b94871 100755 --- a/factory/hawao/flash-base.sh +++ b/factory/hawao/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/husky/flash-all.bat b/factory/husky/flash-all.bat index 42be3e8e..45c21e01 100644 --- a/factory/husky/flash-all.bat +++ b/factory/husky/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || exit /B 1 diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh index 69e1511c..dabbf310 100755 --- a/factory/husky/flash-all.sh +++ b/factory/husky/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh index 8be71ab3..6b6db15d 100755 --- a/factory/husky/flash-base.sh +++ b/factory/husky/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/lynx/flash-all.bat b/factory/lynx/flash-all.bat index b4e4c7c9..4ea91730 100644 --- a/factory/lynx/flash-all.bat +++ b/factory/lynx/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || exit /B 1 diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh index 4b0419d8..86388f34 100755 --- a/factory/lynx/flash-all.sh +++ b/factory/lynx/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh index 558956b7..2ec686a7 100755 --- a/factory/lynx/flash-base.sh +++ b/factory/lynx/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/oriole/flash-all.bat b/factory/oriole/flash-all.bat index 4c306e33..cb7006e7 100644 --- a/factory/oriole/flash-all.bat +++ b/factory/oriole/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || exit /B 1 diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh index 0cabc3bc..d6fda475 100755 --- a/factory/oriole/flash-all.sh +++ b/factory/oriole/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh index c7082a8d..72a87c13 100755 --- a/factory/oriole/flash-base.sh +++ b/factory/oriole/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/panther/flash-all.bat b/factory/panther/flash-all.bat index 77a3a65c..8f7ad5a3 100644 --- a/factory/panther/flash-all.bat +++ b/factory/panther/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || exit /B 1 diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh index 15d09685..2efb0ada 100755 --- a/factory/panther/flash-all.sh +++ b/factory/panther/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh index 669878ee..64c27301 100755 --- a/factory/panther/flash-base.sh +++ b/factory/panther/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/raven/flash-all.bat b/factory/raven/flash-all.bat index a0a59801..a0ee0750 100644 --- a/factory/raven/flash-all.bat +++ b/factory/raven/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || exit /B 1 diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh index a4ffd49c..f840c76c 100755 --- a/factory/raven/flash-all.sh +++ b/factory/raven/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh index 43c3fbf9..086120cd 100755 --- a/factory/raven/flash-base.sh +++ b/factory/raven/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/redfin/flash-all.bat b/factory/redfin/flash-all.bat index 10c9b980..b74ba358 100644 --- a/factory/redfin/flash-all.bat +++ b/factory/redfin/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: redfin" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: redfin" || exit /B 1 diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh index 3dea2b4c..9fb482ce 100755 --- a/factory/redfin/flash-all.sh +++ b/factory/redfin/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/redfin/flash-base.sh b/factory/redfin/flash-base.sh index dd0c14c0..d79ff2dd 100755 --- a/factory/redfin/flash-base.sh +++ b/factory/redfin/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/rhode/flash-all.bat b/factory/rhode/flash-all.bat index 85f95216..8101d213 100644 --- a/factory/rhode/flash-all.bat +++ b/factory/rhode/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: rhode" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: rhode" || exit /B 1 diff --git a/factory/rhode/flash-all.sh b/factory/rhode/flash-all.sh index 7f489fcb..7e1cc815 100755 --- a/factory/rhode/flash-all.sh +++ b/factory/rhode/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/rhode/flash-base.sh b/factory/rhode/flash-base.sh index 865ee41a..2e14cce7 100755 --- a/factory/rhode/flash-base.sh +++ b/factory/rhode/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/sargo/flash-all.bat b/factory/sargo/flash-all.bat index 804d9773..8310a111 100644 --- a/factory/sargo/flash-all.bat +++ b/factory/sargo/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: sargo" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: sargo" || exit /B 1 diff --git a/factory/sargo/flash-all.sh b/factory/sargo/flash-all.sh index 90766e40..1f660773 100755 --- a/factory/sargo/flash-all.sh +++ b/factory/sargo/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/sargo/flash-base.sh b/factory/sargo/flash-base.sh index fed6e713..a05a2c36 100755 --- a/factory/sargo/flash-base.sh +++ b/factory/sargo/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/shiba/flash-all.bat b/factory/shiba/flash-all.bat index 8c03b67d..f65f9bca 100644 --- a/factory/shiba/flash-all.bat +++ b/factory/shiba/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || exit /B 1 diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh index f29bd235..fba73647 100755 --- a/factory/shiba/flash-all.sh +++ b/factory/shiba/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh index b8c6d7d8..525a974e 100755 --- a/factory/shiba/flash-base.sh +++ b/factory/shiba/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/sunfish/flash-all.bat b/factory/sunfish/flash-all.bat index b3bb34dd..2ac0820a 100644 --- a/factory/sunfish/flash-all.bat +++ b/factory/sunfish/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: sunfish" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: sunfish" || exit /B 1 diff --git a/factory/sunfish/flash-all.sh b/factory/sunfish/flash-all.sh index 243802c4..e83c81cf 100755 --- a/factory/sunfish/flash-all.sh +++ b/factory/sunfish/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/sunfish/flash-base.sh b/factory/sunfish/flash-base.sh index f53d64cd..0a0257e0 100755 --- a/factory/sunfish/flash-base.sh +++ b/factory/sunfish/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/tangorpro/flash-all.bat b/factory/tangorpro/flash-all.bat index e63d5bfb..406a3eac 100644 --- a/factory/tangorpro/flash-all.bat +++ b/factory/tangorpro/flash-all.bat @@ -14,6 +14,8 @@ :: See the License for the specific language governing permissions and :: limitations under the License. +if "%DEVICE_FLASHER_VERSION%"=="" choice /M "Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway." +if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || exit /B 1 diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh index 31f24388..150677e5 100755 --- a/factory/tangorpro/flash-all.sh +++ b/factory/tangorpro/flash-all.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh index e2d99053..bdbd58e7 100755 --- a/factory/tangorpro/flash-base.sh +++ b/factory/tangorpro/flash-base.sh @@ -16,6 +16,13 @@ set -eu +if test -z "${DEVICE_FLASHER_VERSION:-}"; then + printf 'Use device-flasher to flash your device properly! See install guide at https://calyxos.org for more info. Enter Y to continue anyway. ' + read answer + if [ "$answer" != "Y" ]; then + exit 1 + fi +fi fastboot_version="$("$(which fastboot)" --version | grep "^fastboot version" | cut -c18-23 | sed 's/\.//g' )" if ! [ "${fastboot_version:-0}" -ge 3301 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" From 7908c37fb3cb3c624e97055c947001831c5e29ef Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 6 Aug 2024 15:50:21 -0400 Subject: [PATCH 050/111] August 2024 Security update Change-Id: Id8137f852b52351762586320fd8c156aa6f41172 --- vars/akita | 20 ++++++++++---------- vars/barbet | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 13 files changed, 125 insertions(+), 125 deletions(-) diff --git a/vars/akita b/vars/akita index ed522532..f422060d 100644 --- a/vars/akita +++ b/vars/akita @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.005" +readonly build_id="AP2A.240805.005.A1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r53" +readonly prev_aosp_tag="android-14.0.0_r53" +readonly aosp_tag="android-14.0.0_r56" -readonly build_number="11942872" +readonly build_number="12030693" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240705.005-factory-df5f07ce.zip" -readonly image_sha256="df5f07ce1bb72f1c3802178aa367c5d21cedbbc46fd34adbc9d9a09baf4bd1e0" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240805.005.a1-factory-c57ea37c.zip" +readonly image_sha256="c57ea37c0e8ddbe12da9e6ea97e27640bd18394df1645d228c99705fdfc01626" -readonly flash_url="https://flash.android.com/build/11942872?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12030693?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240705.005-fbd833f2.zip" -readonly ota_sha256="fbd833f292ff08e0ca173644a11181f5395082729f5ae2730e47ba85778c811a" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240805.005.a1-f6667708.zip" +readonly ota_sha256="f66677082c40a755463542ac1ed0ce658f08f8433962e98d44c4365e0cb5e22f" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/barbet b/vars/barbet index ea22cdfd..56e3aaab 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11875680" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240705.004-factory-05919506.zip" -readonly image_sha256="05919506813ec8d26dba3c0ac1d300ec33d981ce6836efb077f5cd4df736e2e9" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240805.005-factory-231e0672.zip" +readonly image_sha256="231e06729299ce594d8b929a0db7d2cb845e74d0fb014b9938f515d0d3f9703c" -readonly flash_url="https://flash.android.com/build/11875680?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240705.004-59dbe024.zip" -readonly ota_sha256="59dbe0243117258adad890e304134fc45d19314f6fd87cf4fe7a620576c59a49" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240805.005-44633b16.zip" +readonly ota_sha256="44633b16c66bd19bdf160bf6d65af95b7d038c8a172a972f4f38843146d06ffe" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/bluejay b/vars/bluejay index 495ed009..07e431c0 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005.F1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r61" -readonly build_number="11875680" +readonly build_number="12043167" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240705.004-factory-22c92bf8.zip" -readonly image_sha256="22c92bf8909f5004dfcf9e89c7b1d22acd2cefe85719a40c8e0bac212a4ce8be" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240805.005.f1-factory-5ff0002b.zip" +readonly image_sha256="5ff0002b1c49a88071162a6ce11a21c7ccdfa8f14dc3f0361c8e140ddef3978f" -readonly flash_url="https://flash.android.com/build/11875680?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12043167?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240705.004-0b2bc993.zip" -readonly ota_sha256="0b2bc993977cc222071cdf8f01be037fdfa106064b53225ec1c9d96692c04c91" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240805.005.f1-cfb82605.zip" +readonly ota_sha256="cfb8260531c0b7aaea31d2820bd9ef16054791b8b9c82f790714abf45ef14aec" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/cheetah b/vars/cheetah index acf90b55..9bd42df8 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11875680" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240705.004-factory-f5dae343.zip" -readonly image_sha256="f5dae3433976125e761dc29de23e5dfeaca934431e2f7b9ae68429454cd74a8b" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240805.005-factory-3f647705.zip" +readonly image_sha256="3f647705f30a9cc5c149e35604f50935f666bce4f7489a79b921579b128839cd" -readonly flash_url="https://flash.android.com/build/11875680?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240705.004-6c6f1111.zip" -readonly ota_sha256="6c6f1111c59504327286bf5097db74a1492d519d0abab80f40938f999c6d8144" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240805.005-263ad45e.zip" +readonly ota_sha256="263ad45e06aaf7a9e7344816a577c20fae8a56fc2a280b2f0625742b04e3589f" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/common b/vars/common index 6696b828..ef3ed5ec 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr3-release # Jul 2024 +readonly common_aosp_branch=android14-qpr3-release # Aug 2024 -readonly prev_common_aosp_tag=android-14.0.0_r50 # Jun 2024, Pixel 5a - 8 -readonly common_aosp_tag=android-14.0.0_r53 # Jul 2024, Pixel 8 +readonly prev_common_aosp_tag=android-14.0.0_r53 # Jul 2024, Pixel 8 +readonly common_aosp_tag=android-14.0.0_r55 # Aug 2024, Pixel 5a, 7, 8 -readonly common_aosp_build_id=AP2A.240705.005 # Jul 2024, Pixel 8 +readonly common_aosp_build_id=AP2A.240805.005 # Aug 2024, Pixel 5a, 7, 8 -readonly topic=jul24 +readonly topic=aug24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 1dff65ed..459e078a 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11875680" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240705.004-factory-390a81d8.zip" -readonly image_sha256="390a81d826378ff26d62fa2219170d542b75955bdd490a23290b5afed1a59b11" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240805.005-factory-955134df.zip" +readonly image_sha256="955134df6a69481e8b65f486bc393a8717aa07af1a0635f34f440735e339ddf0" -readonly flash_url="https://flash.android.com/build/11875680?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240705.004-331b80dd.zip" -readonly ota_sha256="331b80dd51828e94782f4d7d1f57001706a9387547c597f373736a8fd3b421c9" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240805.005-49d06501.zip" +readonly ota_sha256="49d06501f9b4f7a55be889cbd17b4bdc106946d649826d8f3a5842515d2e3322" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/husky b/vars/husky index a5935f34..7d1079f9 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.005" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r53" +readonly prev_aosp_tag="android-14.0.0_r53" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11942872" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240705.005-factory-5cd8df1e.zip" -readonly image_sha256="5cd8df1e27039b3af10e38247666839af30fb5eb598f4fb8730beb563c44d108" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240805.005-factory-06d11dac.zip" +readonly image_sha256="06d11dac76a73c42b81a3b143f663ecc65b405b3ca45c35a6d1a18d98e7e0a6d" -readonly flash_url="https://flash.android.com/build/11942872?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240705.005-53506844.zip" -readonly ota_sha256="5350684479678128191ffc5e79e7effff5b8913f3e7291b407f5adbdd16de011" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240805.005-0cbc4d6a.zip" +readonly ota_sha256="0cbc4d6a62694b0eb7e24ad3d9f7d64a2c93f651175b8e8b13a712fd49b8be04" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/lynx b/vars/lynx index 3efc729e..eaaca412 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11875680" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240705.004-factory-ca59166f.zip" -readonly image_sha256="ca59166f1987ed33d85c48b832777d3fa7f37b1b5f64b4beea6363ae487471eb" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240805.005-factory-387d71b1.zip" +readonly image_sha256="387d71b164bb4dc28fe029b4d18ad19f254c43cfec2537e22de61bfea9812461" -readonly flash_url="https://flash.android.com/build/11875680?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240705.004-89bce1b6.zip" -readonly ota_sha256="89bce1b6943cacd8d975214350e66549ca7739c924bfc9626ed3c62846ae7c6e" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240805.005-3c70d8fe.zip" +readonly ota_sha256="3c70d8fe33af184daffbc0a29802de3564969a41554fa06b2f114ff9395cbdda" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/oriole b/vars/oriole index b569ac5c..b3448e12 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005.F1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r61" -readonly build_number="11875680" +readonly build_number="12043167" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240705.004-factory-bbe3b936.zip" -readonly image_sha256="bbe3b936292ba0cedff1f8074bff89d8bc2206ccb01c325967748bb028a847d4" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240805.005.f1-factory-a0d64730.zip" +readonly image_sha256="a0d64730ba40a3ccb6089cf42bdffd836b645d88aa236f647ef604b571d0df22" -readonly flash_url="https://flash.android.com/build/11875680?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12043167?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240705.004-0fe0567d.zip" -readonly ota_sha256="0fe0567d7f6c0144a4050c62004222f02e17c6cab401bee29c378fb7c8440de9" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240805.005.f1-3779b626.zip" +readonly ota_sha256="3779b62613ec56e03b26449760678148d40f205ba645add32258399305f6185a" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/panther b/vars/panther index bc00526a..3633d41f 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11875680" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240705.004-factory-42a1bfe9.zip" -readonly image_sha256="42a1bfe94a30f3cb2c37e0c268c06bbe0ea9fadb49ee1ade88b0352d85708fc0" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240805.005-factory-b789fc80.zip" +readonly image_sha256="b789fc80d17f29a51f78ee34a61c09333596ba93f79e1bb010e3a9b29bca0d3b" -readonly flash_url="https://flash.android.com/build/11875680?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240705.004-5ce14c35.zip" -readonly ota_sha256="5ce14c350d8eabe92e844d25473446a01f39688c0d14001fff10ef3631e1a8ab" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240805.005-6c5543a9.zip" +readonly ota_sha256="6c5543a9e282f37838b005b00d7011fdb6891bdb8cb9d1e874cd9c9bb9577d8c" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/raven b/vars/raven index d10b92f6..8d1f820f 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005.F1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r61" -readonly build_number="11875680" +readonly build_number="12043167" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240705.004-factory-02dd665c.zip" -readonly image_sha256="02dd665c4dbcca60084d2f04b4a4ea85f7c374217a7443f203a899f7a6bc01c3" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240805.005.f1-factory-28b5398f.zip" +readonly image_sha256="28b5398fc5f24c88e0a6f3ab4e716d538f6790b7a96dad77a55a476ee271b96a" -readonly flash_url="https://flash.android.com/build/11875680?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12043167?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240705.004-f958fe50.zip" -readonly ota_sha256="f958fe502a5c006a15d9c865ab01ba222d7edbfa80a7d14a9e4861b2c61633a4" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240805.005.f1-486d5763.zip" +readonly ota_sha256="486d5763c1f6e45ef476fa103a39986def994ab14fc461ce917f7500ca7d6a59" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/shiba b/vars/shiba index 45e0ea5c..717011a6 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.005" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r53" +readonly prev_aosp_tag="android-14.0.0_r53" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11942872" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240705.005-factory-461aa7c8.zip" -readonly image_sha256="461aa7c8a7834b429a73d50154ee194e7c22a2bdfa5fde417dc9c8b6c18dd91d" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240805.005-factory-47c02ead.zip" +readonly image_sha256="47c02ead914cca59832a20bc477e88fc969127e277eec1f34fe9edd1cee293a3" -readonly flash_url="https://flash.android.com/build/11942872?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240705.005-3376b945.zip" -readonly ota_sha256="3376b945e3769c3b90b8a5715b66b5a12be7bbd68151b7b1c303079ce8f3e719" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240805.005-bcd0cb98.zip" +readonly ota_sha256="bcd0cb98b4f51d823c7b515f7c2eea5bd864872653c36b30dde99701bc7343fb" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" diff --git a/vars/tangorpro b/vars/tangorpro index 7bf5caee..9ae87a73 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240705.004" +readonly build_id="AP2A.240805.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r50" -readonly aosp_tag="android-14.0.0_r52" +readonly prev_aosp_tag="android-14.0.0_r52" +readonly aosp_tag="android-14.0.0_r55" -readonly build_number="11875680" +readonly build_number="12025142" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240705.004-factory-f096bbe3.zip" -readonly image_sha256="f096bbe33013abfd3f6759a317f959a79efc7530011810857d2ab33c0f98114a" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240805.005-factory-0ba88569.zip" +readonly image_sha256="0ba8856904bcefd259176c11e849db166669ae5368748b85af86edb3bf1bc8c2" -readonly flash_url="https://flash.android.com/build/11875680?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12025142?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240705.004-e9472688.zip" -readonly ota_sha256="e94726886f4d0b2462159a1160d37f113ab808a871369559b41b88b00b40ac5d" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240805.005-99381bb6.zip" +readonly ota_sha256="99381bb65050c6c92787fe1580706f67a0160ee724dd38b8c47b76016b19050b" -readonly security_patch="2024-07-05" +readonly security_patch="2024-08-05" From cc5eace45e3477e81939c8d4fc4aeac8c5fd5549 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Wed, 21 Aug 2024 20:24:04 +0300 Subject: [PATCH 051/111] carriersettings-extractor: regenerate pb2 on the fly Traceback (most recent call last): File "/mnt/nvmestorage/lineage-21.0/device/motorola/bronco/./../../motorola/sm8475-common/../../../lineage/scripts/carriersettings-extractor/carriersettings_extractor.py", line 12, in from carrier_settings_pb2 import CarrierSettings, MultiCarrierSettings File "/mnt/nvmestorage/lineage-21.0/lineage/scripts/carriersettings-extractor/carrier_settings_pb2.py", line 34, in _descriptor.EnumValueDescriptor( File "/usr/lib/python3.12/site-packages/google/protobuf/descriptor.py", line 920, in __new__ _message.Message._CheckCalledFromGeneratedFile() TypeError: Descriptors cannot be created directly. If this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0. If you cannot immediately regenerate your protos, some other possible workarounds are: 1. Downgrade the protobuf package to 3.20.x or lower. 2. Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python (but this will use pure-Python parsing and will be much slower). More information: https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates Change-Id: Ic1acce1fe933edc9a3654c424863abe4d54ec20d --- carriersettings-extractor/.gitignore | 1 + carriersettings-extractor/carrierId_pb2.py | 54 -- carriersettings-extractor/carrier_list_pb2.py | 54 -- .../carrier_settings_pb2.py | 902 ------------------ .../carriersettings_extractor.py | 8 + 5 files changed, 9 insertions(+), 1010 deletions(-) delete mode 100644 carriersettings-extractor/carrierId_pb2.py delete mode 100644 carriersettings-extractor/carrier_list_pb2.py delete mode 100644 carriersettings-extractor/carrier_settings_pb2.py diff --git a/carriersettings-extractor/.gitignore b/carriersettings-extractor/.gitignore index 6e4266f3..586374c3 100644 --- a/carriersettings-extractor/.gitignore +++ b/carriersettings-extractor/.gitignore @@ -1,3 +1,4 @@ __pycache__/ *.py[cod] *$py.class +*_pb2.py diff --git a/carriersettings-extractor/carrierId_pb2.py b/carriersettings-extractor/carrierId_pb2.py deleted file mode 100644 index 91b3b7ce..00000000 --- a/carriersettings-extractor/carrierId_pb2.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: carrierId.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63\x61rrierId.proto\x12\x15\x63\x61rrierIdentification\"T\n\x0b\x43\x61rrierList\x12\x34\n\ncarrier_id\x18\x01 \x03(\x0b\x32 .carrierIdentification.CarrierId\x12\x0f\n\x07version\x18\x02 \x01(\x05\"\x98\x01\n\tCarrierId\x12\x14\n\x0c\x63\x61nonical_id\x18\x01 \x01(\x05\x12\x14\n\x0c\x63\x61rrier_name\x18\x02 \x01(\t\x12\x42\n\x11\x63\x61rrier_attribute\x18\x03 \x03(\x0b\x32\'.carrierIdentification.CarrierAttribute\x12\x1b\n\x13parent_canonical_id\x18\x04 \x01(\x05\"\xc9\x01\n\x10\x43\x61rrierAttribute\x12\x14\n\x0cmccmnc_tuple\x18\x01 \x03(\t\x12\x1c\n\x14imsi_prefix_xpattern\x18\x02 \x03(\t\x12\x0b\n\x03spn\x18\x03 \x03(\t\x12\x0c\n\x04plmn\x18\x04 \x03(\t\x12\x0c\n\x04gid1\x18\x05 \x03(\t\x12\x0c\n\x04gid2\x18\x06 \x03(\t\x12\x15\n\rpreferred_apn\x18\x07 \x03(\t\x12\x14\n\x0ciccid_prefix\x18\x08 \x03(\t\x12\x1d\n\x15privilege_access_rule\x18\t \x03(\t') - - - -_CARRIERLIST = DESCRIPTOR.message_types_by_name['CarrierList'] -_CARRIERID = DESCRIPTOR.message_types_by_name['CarrierId'] -_CARRIERATTRIBUTE = DESCRIPTOR.message_types_by_name['CarrierAttribute'] -CarrierList = _reflection.GeneratedProtocolMessageType('CarrierList', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERLIST, - '__module__' : 'carrierId_pb2' - # @@protoc_insertion_point(class_scope:carrierIdentification.CarrierList) - }) -_sym_db.RegisterMessage(CarrierList) - -CarrierId = _reflection.GeneratedProtocolMessageType('CarrierId', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERID, - '__module__' : 'carrierId_pb2' - # @@protoc_insertion_point(class_scope:carrierIdentification.CarrierId) - }) -_sym_db.RegisterMessage(CarrierId) - -CarrierAttribute = _reflection.GeneratedProtocolMessageType('CarrierAttribute', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERATTRIBUTE, - '__module__' : 'carrierId_pb2' - # @@protoc_insertion_point(class_scope:carrierIdentification.CarrierAttribute) - }) -_sym_db.RegisterMessage(CarrierAttribute) - -if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - _CARRIERLIST._serialized_start=42 - _CARRIERLIST._serialized_end=126 - _CARRIERID._serialized_start=129 - _CARRIERID._serialized_end=281 - _CARRIERATTRIBUTE._serialized_start=284 - _CARRIERATTRIBUTE._serialized_end=485 -# @@protoc_insertion_point(module_scope) diff --git a/carriersettings-extractor/carrier_list_pb2.py b/carriersettings-extractor/carrier_list_pb2.py deleted file mode 100644 index 483cb54f..00000000 --- a/carriersettings-extractor/carrier_list_pb2.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: carrier_list.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x63\x61rrier_list.proto\x12\x12\x63om.google.carrier\"^\n\tCarrierId\x12\x0f\n\x07mcc_mnc\x18\x01 \x01(\t\x12\r\n\x03spn\x18\x02 \x01(\tH\x00\x12\x0e\n\x04imsi\x18\x03 \x01(\tH\x00\x12\x0e\n\x04gid1\x18\x04 \x01(\tH\x00\x42\x0b\n\tmvno_dataJ\x04\x08\x05\x10\x06\"]\n\nCarrierMap\x12\x16\n\x0e\x63\x61nonical_name\x18\x01 \x01(\t\x12\x31\n\ncarrier_id\x18\x02 \x03(\x0b\x32\x1d.com.google.carrier.CarrierIdJ\x04\x08\x03\x10\x04\"M\n\x0b\x43\x61rrierList\x12-\n\x05\x65ntry\x18\x01 \x03(\x0b\x32\x1e.com.google.carrier.CarrierMap\x12\x0f\n\x07version\x18\x02 \x01(\x03') - - - -_CARRIERID = DESCRIPTOR.message_types_by_name['CarrierId'] -_CARRIERMAP = DESCRIPTOR.message_types_by_name['CarrierMap'] -_CARRIERLIST = DESCRIPTOR.message_types_by_name['CarrierList'] -CarrierId = _reflection.GeneratedProtocolMessageType('CarrierId', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERID, - '__module__' : 'carrier_list_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierId) - }) -_sym_db.RegisterMessage(CarrierId) - -CarrierMap = _reflection.GeneratedProtocolMessageType('CarrierMap', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERMAP, - '__module__' : 'carrier_list_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierMap) - }) -_sym_db.RegisterMessage(CarrierMap) - -CarrierList = _reflection.GeneratedProtocolMessageType('CarrierList', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERLIST, - '__module__' : 'carrier_list_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierList) - }) -_sym_db.RegisterMessage(CarrierList) - -if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - _CARRIERID._serialized_start=42 - _CARRIERID._serialized_end=136 - _CARRIERMAP._serialized_start=138 - _CARRIERMAP._serialized_end=231 - _CARRIERLIST._serialized_start=233 - _CARRIERLIST._serialized_end=310 -# @@protoc_insertion_point(module_scope) diff --git a/carriersettings-extractor/carrier_settings_pb2.py b/carriersettings-extractor/carrier_settings_pb2.py deleted file mode 100644 index eac646e6..00000000 --- a/carriersettings-extractor/carrier_settings_pb2.py +++ /dev/null @@ -1,902 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: carrier_settings.proto - -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='carrier_settings.proto', - package='com.google.carrier', - syntax='proto2', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x16\x63\x61rrier_settings.proto\x12\x12\x63om.google.carrier\"\xde\x01\n\x0f\x43\x61rrierSettings\x12\x16\n\x0e\x63\x61nonical_name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03\x12-\n\x04\x61pns\x18\x03 \x01(\x0b\x32\x1f.com.google.carrier.CarrierApns\x12\x32\n\x07\x63onfigs\x18\x04 \x01(\x0b\x32!.com.google.carrier.CarrierConfig\x12\x39\n\x0evendor_configs\x18\x06 \x01(\x0b\x32!.com.google.carrier.VendorConfigsJ\x04\x08\x05\x10\x06\"]\n\x14MultiCarrierSettings\x12\x0f\n\x07version\x18\x01 \x01(\x03\x12\x34\n\x07setting\x18\x02 \x03(\x0b\x32#.com.google.carrier.CarrierSettings\"\xf3\x07\n\x07\x41pnItem\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\x31\n\x04type\x18\x03 \x03(\x0e\x32#.com.google.carrier.ApnItem.ApnType\x12\x19\n\x0e\x62\x65\x61rer_bitmask\x18\x04 \x01(\t:\x01\x30\x12\x0e\n\x06server\x18\x05 \x01(\t\x12\r\n\x05proxy\x18\x06 \x01(\t\x12\x0c\n\x04port\x18\x07 \x01(\t\x12\x0c\n\x04user\x18\x08 \x01(\t\x12\x10\n\x08password\x18\t \x01(\t\x12\x14\n\x08\x61uthtype\x18\n \x01(\x05:\x02-1\x12\x0c\n\x04mmsc\x18\x0b \x01(\t\x12\x12\n\nmmsc_proxy\x18\x0c \x01(\t\x12\x17\n\x0fmmsc_proxy_port\x18\r \x01(\t\x12:\n\x08protocol\x18\x0e \x01(\x0e\x32$.com.google.carrier.ApnItem.Protocol:\x02IP\x12\x42\n\x10roaming_protocol\x18\x0f \x01(\x0e\x32$.com.google.carrier.ApnItem.Protocol:\x02IP\x12\x0e\n\x03mtu\x18\x10 \x01(\x05:\x01\x30\x12\x12\n\nprofile_id\x18\x11 \x01(\x05\x12\x14\n\tmax_conns\x18\x12 \x01(\x05:\x01\x30\x12\x14\n\twait_time\x18\x13 \x01(\x05:\x01\x30\x12\x19\n\x0emax_conns_time\x18\x14 \x01(\x05:\x01\x30\x12\x17\n\x0f\x63\x61rrier_enabled\x18\x15 \x01(\x08\x12\x1e\n\x0fmodem_cognitive\x18\x16 \x01(\x08:\x05\x66\x61lse\x12\x1a\n\x0cuser_visible\x18\x17 \x01(\x08:\x04true\x12\x1b\n\ruser_editable\x18\x18 \x01(\x08:\x04true\x12\x15\n\napn_set_id\x18\x19 \x01(\x05:\x01\x30\x12L\n\x0cskip_464xlat\x18\x1a \x01(\x0e\x32 .com.google.carrier.ApnItem.Xlat:\x14SKIP_464XLAT_DEFAULT\"\x94\x01\n\x07\x41pnType\x12\x07\n\x03\x41LL\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\x07\n\x03MMS\x10\x02\x12\x08\n\x04SUPL\x10\x03\x12\x07\n\x03\x44UN\x10\x04\x12\t\n\x05HIPRI\x10\x05\x12\x08\n\x04\x46OTA\x10\x06\x12\x07\n\x03IMS\x10\x07\x12\x07\n\x03\x43\x42S\x10\x08\x12\x06\n\x02IA\x10\t\x12\r\n\tEMERGENCY\x10\n\x12\x08\n\x04XCAP\x10\x0b\x12\x06\n\x02UT\x10\x0c\x12\x07\n\x03RCS\x10\r\"1\n\x08Protocol\x12\x06\n\x02IP\x10\x00\x12\x08\n\x04IPV6\x10\x01\x12\n\n\x06IPV4V6\x10\x02\x12\x07\n\x03PPP\x10\x03\"S\n\x04Xlat\x12\x18\n\x14SKIP_464XLAT_DEFAULT\x10\x00\x12\x18\n\x14SKIP_464XLAT_DISABLE\x10\x01\x12\x17\n\x13SKIP_464XLAT_ENABLE\x10\x02\"=\n\x0b\x43\x61rrierApns\x12(\n\x03\x61pn\x18\x02 \x03(\x0b\x32\x1b.com.google.carrier.ApnItemJ\x04\x08\x01\x10\x02\"\x19\n\tTextArray\x12\x0c\n\x04item\x18\x01 \x03(\t\"\x18\n\x08IntArray\x12\x0c\n\x04item\x18\x01 \x03(\x05\"\x82\x03\n\rCarrierConfig\x12\x38\n\x06\x63onfig\x18\x02 \x03(\x0b\x32(.com.google.carrier.CarrierConfig.Config\x1a\xaa\x02\n\x06\x43onfig\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x14\n\ntext_value\x18\x02 \x01(\tH\x00\x12\x13\n\tint_value\x18\x03 \x01(\x05H\x00\x12\x14\n\nlong_value\x18\x04 \x01(\x03H\x00\x12\x14\n\nbool_value\x18\x05 \x01(\x08H\x00\x12\x33\n\ntext_array\x18\x06 \x01(\x0b\x32\x1d.com.google.carrier.TextArrayH\x00\x12\x31\n\tint_array\x18\x07 \x01(\x0b\x32\x1c.com.google.carrier.IntArrayH\x00\x12\x33\n\x06\x62undle\x18\x08 \x01(\x0b\x32!.com.google.carrier.CarrierConfigH\x00\x12\x16\n\x0c\x64ouble_value\x18\t \x01(\x01H\x00\x42\x07\n\x05valueJ\x04\x08\x01\x10\x02J\x04\x08\x03\x10\x04\"8\n\x12VendorConfigClient\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\r\n\x05value\x18\x02 \x01(\x0c*\x05\x08\x64\x10\x89\'\"M\n\rVendorConfigs\x12\x36\n\x06\x63lient\x18\x02 \x03(\x0b\x32&.com.google.carrier.VendorConfigClientJ\x04\x08\x01\x10\x02' -) - - - -_APNITEM_APNTYPE = _descriptor.EnumDescriptor( - name='ApnType', - full_name='com.google.carrier.ApnItem.ApnType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='ALL', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DEFAULT', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='MMS', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SUPL', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DUN', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='HIPRI', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FOTA', index=6, number=6, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IMS', index=7, number=7, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CBS', index=8, number=8, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IA', index=9, number=9, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='EMERGENCY', index=10, number=10, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='XCAP', index=11, number=11, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='UT', index=12, number=12, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RCS', index=13, number=13, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=1094, - serialized_end=1242, -) -_sym_db.RegisterEnumDescriptor(_APNITEM_APNTYPE) - -_APNITEM_PROTOCOL = _descriptor.EnumDescriptor( - name='Protocol', - full_name='com.google.carrier.ApnItem.Protocol', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='IP', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IPV6', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IPV4V6', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PPP', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=1244, - serialized_end=1293, -) -_sym_db.RegisterEnumDescriptor(_APNITEM_PROTOCOL) - -_APNITEM_XLAT = _descriptor.EnumDescriptor( - name='Xlat', - full_name='com.google.carrier.ApnItem.Xlat', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='SKIP_464XLAT_DEFAULT', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SKIP_464XLAT_DISABLE', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SKIP_464XLAT_ENABLE', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=1295, - serialized_end=1378, -) -_sym_db.RegisterEnumDescriptor(_APNITEM_XLAT) - - -_CARRIERSETTINGS = _descriptor.Descriptor( - name='CarrierSettings', - full_name='com.google.carrier.CarrierSettings', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='canonical_name', full_name='com.google.carrier.CarrierSettings.canonical_name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='version', full_name='com.google.carrier.CarrierSettings.version', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='apns', full_name='com.google.carrier.CarrierSettings.apns', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='configs', full_name='com.google.carrier.CarrierSettings.configs', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='vendor_configs', full_name='com.google.carrier.CarrierSettings.vendor_configs', index=4, - number=6, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=47, - serialized_end=269, -) - - -_MULTICARRIERSETTINGS = _descriptor.Descriptor( - name='MultiCarrierSettings', - full_name='com.google.carrier.MultiCarrierSettings', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='version', full_name='com.google.carrier.MultiCarrierSettings.version', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='setting', full_name='com.google.carrier.MultiCarrierSettings.setting', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=271, - serialized_end=364, -) - - -_APNITEM = _descriptor.Descriptor( - name='ApnItem', - full_name='com.google.carrier.ApnItem', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='com.google.carrier.ApnItem.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='value', full_name='com.google.carrier.ApnItem.value', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type', full_name='com.google.carrier.ApnItem.type', index=2, - number=3, type=14, cpp_type=8, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='bearer_bitmask', full_name='com.google.carrier.ApnItem.bearer_bitmask', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=True, default_value=b"0".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='server', full_name='com.google.carrier.ApnItem.server', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='proxy', full_name='com.google.carrier.ApnItem.proxy', index=5, - number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='port', full_name='com.google.carrier.ApnItem.port', index=6, - number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='user', full_name='com.google.carrier.ApnItem.user', index=7, - number=8, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='password', full_name='com.google.carrier.ApnItem.password', index=8, - number=9, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='authtype', full_name='com.google.carrier.ApnItem.authtype', index=9, - number=10, type=5, cpp_type=1, label=1, - has_default_value=True, default_value=-1, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='mmsc', full_name='com.google.carrier.ApnItem.mmsc', index=10, - number=11, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='mmsc_proxy', full_name='com.google.carrier.ApnItem.mmsc_proxy', index=11, - number=12, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='mmsc_proxy_port', full_name='com.google.carrier.ApnItem.mmsc_proxy_port', index=12, - number=13, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='protocol', full_name='com.google.carrier.ApnItem.protocol', index=13, - number=14, type=14, cpp_type=8, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='roaming_protocol', full_name='com.google.carrier.ApnItem.roaming_protocol', index=14, - number=15, type=14, cpp_type=8, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='mtu', full_name='com.google.carrier.ApnItem.mtu', index=15, - number=16, type=5, cpp_type=1, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='profile_id', full_name='com.google.carrier.ApnItem.profile_id', index=16, - number=17, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='max_conns', full_name='com.google.carrier.ApnItem.max_conns', index=17, - number=18, type=5, cpp_type=1, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='wait_time', full_name='com.google.carrier.ApnItem.wait_time', index=18, - number=19, type=5, cpp_type=1, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='max_conns_time', full_name='com.google.carrier.ApnItem.max_conns_time', index=19, - number=20, type=5, cpp_type=1, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='carrier_enabled', full_name='com.google.carrier.ApnItem.carrier_enabled', index=20, - number=21, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='modem_cognitive', full_name='com.google.carrier.ApnItem.modem_cognitive', index=21, - number=22, type=8, cpp_type=7, label=1, - has_default_value=True, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='user_visible', full_name='com.google.carrier.ApnItem.user_visible', index=22, - number=23, type=8, cpp_type=7, label=1, - has_default_value=True, default_value=True, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='user_editable', full_name='com.google.carrier.ApnItem.user_editable', index=23, - number=24, type=8, cpp_type=7, label=1, - has_default_value=True, default_value=True, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='apn_set_id', full_name='com.google.carrier.ApnItem.apn_set_id', index=24, - number=25, type=5, cpp_type=1, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='skip_464xlat', full_name='com.google.carrier.ApnItem.skip_464xlat', index=25, - number=26, type=14, cpp_type=8, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _APNITEM_APNTYPE, - _APNITEM_PROTOCOL, - _APNITEM_XLAT, - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=367, - serialized_end=1378, -) - - -_CARRIERAPNS = _descriptor.Descriptor( - name='CarrierApns', - full_name='com.google.carrier.CarrierApns', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='apn', full_name='com.google.carrier.CarrierApns.apn', index=0, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1380, - serialized_end=1441, -) - - -_TEXTARRAY = _descriptor.Descriptor( - name='TextArray', - full_name='com.google.carrier.TextArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='item', full_name='com.google.carrier.TextArray.item', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1443, - serialized_end=1468, -) - - -_INTARRAY = _descriptor.Descriptor( - name='IntArray', - full_name='com.google.carrier.IntArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='item', full_name='com.google.carrier.IntArray.item', index=0, - number=1, type=5, cpp_type=1, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1470, - serialized_end=1494, -) - - -_CARRIERCONFIG_CONFIG = _descriptor.Descriptor( - name='Config', - full_name='com.google.carrier.CarrierConfig.Config', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='key', full_name='com.google.carrier.CarrierConfig.Config.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='text_value', full_name='com.google.carrier.CarrierConfig.Config.text_value', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='int_value', full_name='com.google.carrier.CarrierConfig.Config.int_value', index=2, - number=3, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='long_value', full_name='com.google.carrier.CarrierConfig.Config.long_value', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='bool_value', full_name='com.google.carrier.CarrierConfig.Config.bool_value', index=4, - number=5, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='text_array', full_name='com.google.carrier.CarrierConfig.Config.text_array', index=5, - number=6, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='int_array', full_name='com.google.carrier.CarrierConfig.Config.int_array', index=6, - number=7, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='bundle', full_name='com.google.carrier.CarrierConfig.Config.bundle', index=7, - number=8, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='double_value', full_name='com.google.carrier.CarrierConfig.Config.double_value', index=8, - number=9, type=1, cpp_type=5, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='value', full_name='com.google.carrier.CarrierConfig.Config.value', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=1573, - serialized_end=1871, -) - -_CARRIERCONFIG = _descriptor.Descriptor( - name='CarrierConfig', - full_name='com.google.carrier.CarrierConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='config', full_name='com.google.carrier.CarrierConfig.config', index=0, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[_CARRIERCONFIG_CONFIG, ], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1497, - serialized_end=1883, -) - - -_VENDORCONFIGCLIENT = _descriptor.Descriptor( - name='VendorConfigClient', - full_name='com.google.carrier.VendorConfigClient', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='com.google.carrier.VendorConfigClient.name', index=0, - number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='value', full_name='com.google.carrier.VendorConfigClient.value', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=True, - syntax='proto2', - extension_ranges=[(100, 5001), ], - oneofs=[ - ], - serialized_start=1885, - serialized_end=1941, -) - - -_VENDORCONFIGS = _descriptor.Descriptor( - name='VendorConfigs', - full_name='com.google.carrier.VendorConfigs', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='client', full_name='com.google.carrier.VendorConfigs.client', index=0, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1943, - serialized_end=2020, -) - -_CARRIERSETTINGS.fields_by_name['apns'].message_type = _CARRIERAPNS -_CARRIERSETTINGS.fields_by_name['configs'].message_type = _CARRIERCONFIG -_CARRIERSETTINGS.fields_by_name['vendor_configs'].message_type = _VENDORCONFIGS -_MULTICARRIERSETTINGS.fields_by_name['setting'].message_type = _CARRIERSETTINGS -_APNITEM.fields_by_name['type'].enum_type = _APNITEM_APNTYPE -_APNITEM.fields_by_name['protocol'].enum_type = _APNITEM_PROTOCOL -_APNITEM.fields_by_name['roaming_protocol'].enum_type = _APNITEM_PROTOCOL -_APNITEM.fields_by_name['skip_464xlat'].enum_type = _APNITEM_XLAT -_APNITEM_APNTYPE.containing_type = _APNITEM -_APNITEM_PROTOCOL.containing_type = _APNITEM -_APNITEM_XLAT.containing_type = _APNITEM -_CARRIERAPNS.fields_by_name['apn'].message_type = _APNITEM -_CARRIERCONFIG_CONFIG.fields_by_name['text_array'].message_type = _TEXTARRAY -_CARRIERCONFIG_CONFIG.fields_by_name['int_array'].message_type = _INTARRAY -_CARRIERCONFIG_CONFIG.fields_by_name['bundle'].message_type = _CARRIERCONFIG -_CARRIERCONFIG_CONFIG.containing_type = _CARRIERCONFIG -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['text_value']) -_CARRIERCONFIG_CONFIG.fields_by_name['text_value'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['int_value']) -_CARRIERCONFIG_CONFIG.fields_by_name['int_value'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['long_value']) -_CARRIERCONFIG_CONFIG.fields_by_name['long_value'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['bool_value']) -_CARRIERCONFIG_CONFIG.fields_by_name['bool_value'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['text_array']) -_CARRIERCONFIG_CONFIG.fields_by_name['text_array'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['int_array']) -_CARRIERCONFIG_CONFIG.fields_by_name['int_array'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['bundle']) -_CARRIERCONFIG_CONFIG.fields_by_name['bundle'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG_CONFIG.oneofs_by_name['value'].fields.append( - _CARRIERCONFIG_CONFIG.fields_by_name['double_value']) -_CARRIERCONFIG_CONFIG.fields_by_name['double_value'].containing_oneof = _CARRIERCONFIG_CONFIG.oneofs_by_name['value'] -_CARRIERCONFIG.fields_by_name['config'].message_type = _CARRIERCONFIG_CONFIG -_VENDORCONFIGS.fields_by_name['client'].message_type = _VENDORCONFIGCLIENT -DESCRIPTOR.message_types_by_name['CarrierSettings'] = _CARRIERSETTINGS -DESCRIPTOR.message_types_by_name['MultiCarrierSettings'] = _MULTICARRIERSETTINGS -DESCRIPTOR.message_types_by_name['ApnItem'] = _APNITEM -DESCRIPTOR.message_types_by_name['CarrierApns'] = _CARRIERAPNS -DESCRIPTOR.message_types_by_name['TextArray'] = _TEXTARRAY -DESCRIPTOR.message_types_by_name['IntArray'] = _INTARRAY -DESCRIPTOR.message_types_by_name['CarrierConfig'] = _CARRIERCONFIG -DESCRIPTOR.message_types_by_name['VendorConfigClient'] = _VENDORCONFIGCLIENT -DESCRIPTOR.message_types_by_name['VendorConfigs'] = _VENDORCONFIGS -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -CarrierSettings = _reflection.GeneratedProtocolMessageType('CarrierSettings', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERSETTINGS, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierSettings) - }) -_sym_db.RegisterMessage(CarrierSettings) - -MultiCarrierSettings = _reflection.GeneratedProtocolMessageType('MultiCarrierSettings', (_message.Message,), { - 'DESCRIPTOR' : _MULTICARRIERSETTINGS, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.MultiCarrierSettings) - }) -_sym_db.RegisterMessage(MultiCarrierSettings) - -ApnItem = _reflection.GeneratedProtocolMessageType('ApnItem', (_message.Message,), { - 'DESCRIPTOR' : _APNITEM, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.ApnItem) - }) -_sym_db.RegisterMessage(ApnItem) - -CarrierApns = _reflection.GeneratedProtocolMessageType('CarrierApns', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERAPNS, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierApns) - }) -_sym_db.RegisterMessage(CarrierApns) - -TextArray = _reflection.GeneratedProtocolMessageType('TextArray', (_message.Message,), { - 'DESCRIPTOR' : _TEXTARRAY, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.TextArray) - }) -_sym_db.RegisterMessage(TextArray) - -IntArray = _reflection.GeneratedProtocolMessageType('IntArray', (_message.Message,), { - 'DESCRIPTOR' : _INTARRAY, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.IntArray) - }) -_sym_db.RegisterMessage(IntArray) - -CarrierConfig = _reflection.GeneratedProtocolMessageType('CarrierConfig', (_message.Message,), { - - 'Config' : _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { - 'DESCRIPTOR' : _CARRIERCONFIG_CONFIG, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierConfig.Config) - }) - , - 'DESCRIPTOR' : _CARRIERCONFIG, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.CarrierConfig) - }) -_sym_db.RegisterMessage(CarrierConfig) -_sym_db.RegisterMessage(CarrierConfig.Config) - -VendorConfigClient = _reflection.GeneratedProtocolMessageType('VendorConfigClient', (_message.Message,), { - 'DESCRIPTOR' : _VENDORCONFIGCLIENT, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.VendorConfigClient) - }) -_sym_db.RegisterMessage(VendorConfigClient) - -VendorConfigs = _reflection.GeneratedProtocolMessageType('VendorConfigs', (_message.Message,), { - 'DESCRIPTOR' : _VENDORCONFIGS, - '__module__' : 'carrier_settings_pb2' - # @@protoc_insertion_point(class_scope:com.google.carrier.VendorConfigs) - }) -_sym_db.RegisterMessage(VendorConfigs) - - -# @@protoc_insertion_point(module_scope) diff --git a/carriersettings-extractor/carriersettings_extractor.py b/carriersettings-extractor/carriersettings_extractor.py index 9ade24dd..5ed37bb5 100755 --- a/carriersettings-extractor/carriersettings_extractor.py +++ b/carriersettings-extractor/carriersettings_extractor.py @@ -5,10 +5,18 @@ from glob import glob from itertools import product import os.path +import subprocess import sys from xml.etree import ElementTree as ET from xml.sax.saxutils import escape, quoteattr +dir_path = os.path.dirname(os.path.realpath(__file__)) + +for name in glob(f"{dir_path}/*.proto"): + subprocess.run( + ["protoc", "--proto_path=.", "--python_out=.", os.path.basename(name)], + cwd=dir_path) + from carrier_settings_pb2 import CarrierSettings, MultiCarrierSettings from carrier_list_pb2 import CarrierList from carrierId_pb2 import CarrierList as CarrierIdList From a21c25f825a31747bbdccdb94c5df1614e63f06d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 28 Aug 2024 11:21:50 +0300 Subject: [PATCH 052/111] pixel: Drop regen-{carriersettings,vendor} handling This will be handled in devices now. It doesn't affect older branches, since these are already on EOL builds and don't need their lists regenerated ever again. Change-Id: Ic3e48caac303717eeda706e57cd6de2e05449502 --- pixel/device.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pixel/device.sh b/pixel/device.sh index fcb40e98..223b2267 100755 --- a/pixel/device.sh +++ b/pixel/device.sh @@ -47,17 +47,6 @@ device() { "${script_path}/extract-factory-image.sh" "${device}" pushd "${top}" - if [[ -f device/google/${device}/regen-vendor.sh ]]; then - if [[ -z ${wifi_only-} ]]; then - device/google/${device}/regen-carriersettings.sh "${factory_dir}/product.img" device/google/${device}/proprietary-files-carriersettings.txt - fi - device/google/${device}/regen-vendor.sh "${factory_dir}/vendor.img" device/google/${device}/proprietary-files-vendor.txt - else - if [[ -z ${wifi_only-} ]]; then - device/google/*/${device}/regen-carriersettings.sh "${factory_dir}/product.img" device/google/*/${device}/proprietary-files-carriersettings.txt - fi - device/google/*/${device}/regen-vendor.sh "${factory_dir}/vendor.img" device/google/*/${device}/proprietary-files-vendor.txt - fi device/google/${device}/extract-files.sh "${factory_dir}" popd From d6164245597b73661d3850c5da970c85fec1edaf Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 30 Aug 2024 23:13:53 +0530 Subject: [PATCH 053/111] vars: RIP barbet Change-Id: I12ce2a87b6a36bd323e809341240c146f6514a89 --- vars/pixels | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/pixels b/vars/pixels index 5498c0f9..5397c7d8 100644 --- a/vars/pixels +++ b/vars/pixels @@ -12,5 +12,4 @@ readonly devices=( bluejay raven oriole - barbet ) From b4a38cb3a8d2069db900422e7eb3f40dd0cd0245 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 4 Sep 2024 01:23:33 +0530 Subject: [PATCH 054/111] September 2024 Security update Change-Id: I4427bccec29692e91499400381b9e1dfa27a8cf1 --- vars/akita | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 12 files changed, 115 insertions(+), 115 deletions(-) diff --git a/vars/akita b/vars/akita index f422060d..480b98a3 100644 --- a/vars/akita +++ b/vars/akita @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005.A1" +readonly build_id="AP2A.240905.003.A1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r53" -readonly aosp_tag="android-14.0.0_r56" +readonly prev_aosp_tag="android-14.0.0_r56" +readonly aosp_tag="android-14.0.0_r68" -readonly build_number="12030693" +readonly build_number="12234140" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240805.005.a1-factory-c57ea37c.zip" -readonly image_sha256="c57ea37c0e8ddbe12da9e6ea97e27640bd18394df1645d228c99705fdfc01626" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240905.003.a1-factory-39b3cda7.zip" +readonly image_sha256="39b3cda7efbf57e8d5656def2d3ad0e190871a42d34021eaee55e467fd1f359b" -readonly flash_url="https://flash.android.com/build/12030693?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12234140?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240805.005.a1-f6667708.zip" -readonly ota_sha256="f66677082c40a755463542ac1ed0ce658f08f8433962e98d44c4365e0cb5e22f" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240905.003.a1-02dd5149.zip" +readonly ota_sha256="02dd514973798b0d922a0b171a51ec8b8cfc2eaf913e30e7bb97a115998deb5c" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/bluejay b/vars/bluejay index 07e431c0..0d89ee45 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005.F1" +readonly build_id="AP2A.240905.003.F1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r61" +readonly prev_aosp_tag="android-14.0.0_r61" +readonly aosp_tag="android-14.0.0_r73" -readonly build_number="12043167" +readonly build_number="12235381" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240805.005.f1-factory-5ff0002b.zip" -readonly image_sha256="5ff0002b1c49a88071162a6ce11a21c7ccdfa8f14dc3f0361c8e140ddef3978f" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240905.003.f1-factory-ccb9246b.zip" +readonly image_sha256="ccb9246b90b5e89e46ff6af7196a9e11eec453104012fa1290efed6e7a8d2fbe" -readonly flash_url="https://flash.android.com/build/12043167?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12235381?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240805.005.f1-cfb82605.zip" -readonly ota_sha256="cfb8260531c0b7aaea31d2820bd9ef16054791b8b9c82f790714abf45ef14aec" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240905.003.f1-bc5a699a.zip" +readonly ota_sha256="bc5a699a4d37ae146c56b499ce9a7742c1d72bc9e1977859c71378321c3407d3" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/cheetah b/vars/cheetah index 9bd42df8..ea80a4ff 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240805.005-factory-3f647705.zip" -readonly image_sha256="3f647705f30a9cc5c149e35604f50935f666bce4f7489a79b921579b128839cd" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240905.003-factory-ba67b76e.zip" +readonly image_sha256="ba67b76ea0f43f5d827898094b3bfd8d5af9368c486719e15a48ce3cdfacb5d2" -readonly flash_url="https://flash.android.com/build/12025142?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240805.005-263ad45e.zip" -readonly ota_sha256="263ad45e06aaf7a9e7344816a577c20fae8a56fc2a280b2f0625742b04e3589f" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240905.003-be18c366.zip" +readonly ota_sha256="be18c366e7e374d9ba3001af83efe7bd1d6e3292b691224761fbd7c0f2a19cdf" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/common b/vars/common index ef3ed5ec..89292f18 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-14.0 # For update-device-vars.sh readonly os_branch=android14 readonly device_branch=android14 -readonly common_aosp_branch=android14-qpr3-release # Aug 2024 +readonly common_aosp_branch=android14-qpr3-release # Sep 2024 -readonly prev_common_aosp_tag=android-14.0.0_r53 # Jul 2024, Pixel 8 -readonly common_aosp_tag=android-14.0.0_r55 # Aug 2024, Pixel 5a, 7, 8 +readonly prev_common_aosp_tag=android-14.0.0_r55 # Aug 2024, Pixel 5a, 7, 8 +readonly common_aosp_tag=android-14.0.0_r67 # Sep 2024, Pixel 7, 8 -readonly common_aosp_build_id=AP2A.240805.005 # Aug 2024, Pixel 5a, 7, 8 +readonly common_aosp_build_id=AP2A.240905.003 # Sep 2024, Pixel 7, 8 -readonly topic=aug24 +readonly topic=sep24 readonly lineageos_branch=lineage-21.0 readonly lineageos_device_branch=lineage-21 diff --git a/vars/felix b/vars/felix index 459e078a..1758c2bf 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240805.005-factory-955134df.zip" -readonly image_sha256="955134df6a69481e8b65f486bc393a8717aa07af1a0635f34f440735e339ddf0" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240905.003-factory-e9cd2949.zip" +readonly image_sha256="e9cd2949bf406cf621b39b89431423bcc1d36e189548478781e18774d7e70b3b" -readonly flash_url="https://flash.android.com/build/12025142?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240805.005-49d06501.zip" -readonly ota_sha256="49d06501f9b4f7a55be889cbd17b4bdc106946d649826d8f3a5842515d2e3322" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240905.003-ec33d3fa.zip" +readonly ota_sha256="ec33d3faa51073e377612d600e303bf392d64b5adc43097c7a3fc59b8ecca14d" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/husky b/vars/husky index 7d1079f9..38766ad0 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r53" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240805.005-factory-06d11dac.zip" -readonly image_sha256="06d11dac76a73c42b81a3b143f663ecc65b405b3ca45c35a6d1a18d98e7e0a6d" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240905.003-factory-3d55ebeb.zip" +readonly image_sha256="3d55ebeba69775da9e7443f3046f3a4931d9453a7e5fd050fe1f0721c34cbd1e" -readonly flash_url="https://flash.android.com/build/12025142?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240805.005-0cbc4d6a.zip" -readonly ota_sha256="0cbc4d6a62694b0eb7e24ad3d9f7d64a2c93f651175b8e8b13a712fd49b8be04" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240905.003-b20862e1.zip" +readonly ota_sha256="b20862e1a8eb63fccca0219ee8651cf8e3542d9c5f3aa7161f93e3c7f4c201a1" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/lynx b/vars/lynx index eaaca412..43b7f521 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240805.005-factory-387d71b1.zip" -readonly image_sha256="387d71b164bb4dc28fe029b4d18ad19f254c43cfec2537e22de61bfea9812461" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240905.003-factory-e2128987.zip" +readonly image_sha256="e2128987957fa1e9ac54cae9ef25c6031af231c2aecd2dbebd3b2a19e7d180b5" -readonly flash_url="https://flash.android.com/build/12025142?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240805.005-3c70d8fe.zip" -readonly ota_sha256="3c70d8fe33af184daffbc0a29802de3564969a41554fa06b2f114ff9395cbdda" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240905.003-5eaf66b1.zip" +readonly ota_sha256="5eaf66b158244d157d6f5e0cefe592c25f9c5dad05359a76f47f0efb756a634c" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/oriole b/vars/oriole index b3448e12..d3ee1307 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005.F1" +readonly build_id="AP2A.240905.003.F1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r61" +readonly prev_aosp_tag="android-14.0.0_r61" +readonly aosp_tag="android-14.0.0_r73" -readonly build_number="12043167" +readonly build_number="12235381" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240805.005.f1-factory-a0d64730.zip" -readonly image_sha256="a0d64730ba40a3ccb6089cf42bdffd836b645d88aa236f647ef604b571d0df22" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240905.003.f1-factory-655c44e7.zip" +readonly image_sha256="655c44e70a394801d9ea0108f1959fbc0f7143dce6b000440ef47a30b95a20bb" -readonly flash_url="https://flash.android.com/build/12043167?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12235381?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240805.005.f1-3779b626.zip" -readonly ota_sha256="3779b62613ec56e03b26449760678148d40f205ba645add32258399305f6185a" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240905.003.f1-b4ca07c7.zip" +readonly ota_sha256="b4ca07c790a86d63b02365fd415851c433e9377e40888fb537cb28c34ddea8fd" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/panther b/vars/panther index 3633d41f..d0fd7a40 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240805.005-factory-b789fc80.zip" -readonly image_sha256="b789fc80d17f29a51f78ee34a61c09333596ba93f79e1bb010e3a9b29bca0d3b" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240905.003-factory-55a88575.zip" +readonly image_sha256="55a8857543f686b0888dcbd5dc5621f54e327bb1c4bfbc73dcbb8eebcee3d4bc" -readonly flash_url="https://flash.android.com/build/12025142?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240805.005-6c5543a9.zip" -readonly ota_sha256="6c5543a9e282f37838b005b00d7011fdb6891bdb8cb9d1e874cd9c9bb9577d8c" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240905.003-7319d2fd.zip" +readonly ota_sha256="7319d2fdccc80f0477cc0de8804e710988d986332bf69704545722ddf8da6367" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/raven b/vars/raven index 8d1f820f..90b17b38 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005.F1" +readonly build_id="AP2A.240905.003.F1" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r61" +readonly prev_aosp_tag="android-14.0.0_r61" +readonly aosp_tag="android-14.0.0_r73" -readonly build_number="12043167" +readonly build_number="12235381" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240805.005.f1-factory-28b5398f.zip" -readonly image_sha256="28b5398fc5f24c88e0a6f3ab4e716d538f6790b7a96dad77a55a476ee271b96a" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240905.003.f1-factory-c3298655.zip" +readonly image_sha256="c329865565a3ebf04b17a8005e388da7e237a79644b86fba4451bd7cdbd8966e" -readonly flash_url="https://flash.android.com/build/12043167?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12235381?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240805.005.f1-486d5763.zip" -readonly ota_sha256="486d5763c1f6e45ef476fa103a39986def994ab14fc461ce917f7500ca7d6a59" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240905.003.f1-aafe9427.zip" +readonly ota_sha256="aafe9427c69c5e7ea8bbc0fc8c5d4bb9025a8938994b759503d9b4b0c2ee724e" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/shiba b/vars/shiba index 717011a6..6f3532fa 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r53" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240805.005-factory-47c02ead.zip" -readonly image_sha256="47c02ead914cca59832a20bc477e88fc969127e277eec1f34fe9edd1cee293a3" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240905.003-factory-e3f78b31.zip" +readonly image_sha256="e3f78b3156ad883bf1c540c125827fcdc0705474f2624f28e9ec6cdb0c6fd850" -readonly flash_url="https://flash.android.com/build/12025142?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240805.005-bcd0cb98.zip" -readonly ota_sha256="bcd0cb98b4f51d823c7b515f7c2eea5bd864872653c36b30dde99701bc7343fb" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240905.003-fccccd6f.zip" +readonly ota_sha256="fccccd6f7b62048c317fb6c48536afbbbb5b58940a4da64490c4e35ec4f8f747" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" diff --git a/vars/tangorpro b/vars/tangorpro index 9ae87a73..e79e8841 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240905.003" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android14-qpr3-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r67" -readonly build_number="12025142" +readonly build_number="12231197" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240805.005-factory-0ba88569.zip" -readonly image_sha256="0ba8856904bcefd259176c11e849db166669ae5368748b85af86edb3bf1bc8c2" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240905.003-factory-f4e19247.zip" +readonly image_sha256="f4e192474ac4554d8e8ce5c0723b6b9b42d973d24e614d64518d78f7b033283a" -readonly flash_url="https://flash.android.com/build/12025142?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12231197?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240805.005-99381bb6.zip" -readonly ota_sha256="99381bb65050c6c92787fe1580706f67a0160ee724dd38b8c47b76016b19050b" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240905.003-4d96c06a.zip" +readonly ota_sha256="4d96c06a4ae5808ffff6c6a3dd63f214e3ddb9267f18d374878d911c67a0ee61" -readonly security_patch="2024-08-05" +readonly security_patch="2024-09-05" From a2e37561d6572c1caa7e8e4807a4001f0b5610c5 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 5 Sep 2024 01:18:11 +0300 Subject: [PATCH 055/111] gitreview: staging/android15 Change-Id: I985a35e79c6ee1ca3999545873a391e505a72dfa --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 63e89326..7f733c5a 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.calyxos.org port=29418 project=CalyxOS/scripts -defaultbranch=android14 +defaultbranch=staging/android15 From 2151cca9c333ef65d3009e5010683af90a6002c7 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 5 Sep 2024 01:21:20 +0300 Subject: [PATCH 056/111] vars: Initial update for Android 15 Change-Id: Iefefbaab407dc73d05d42433326e96c52df3bd18 --- vars/aosp_target_release | 2 +- vars/common | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vars/aosp_target_release b/vars/aosp_target_release index a595b7bd..f1e04989 100644 --- a/vars/aosp_target_release +++ b/vars/aosp_target_release @@ -1,2 +1,2 @@ # Updated manually -aosp_target_release=ap2a +aosp_target_release=ap3a diff --git a/vars/common b/vars/common index 89292f18..ef502f85 100644 --- a/vars/common +++ b/vars/common @@ -1,20 +1,20 @@ # Entire file updated manually -readonly android_version=14 # For build-desc-fingerprint.sh -readonly aosp_tag_match=android-14.0 # For update-device-vars.sh +readonly android_version=15 # For build-desc-fingerprint.sh +readonly aosp_tag_match=android-15.0 # For update-device-vars.sh -readonly os_branch=android14 -readonly device_branch=android14 +readonly os_branch=staging/android15 +readonly device_branch=staging/android15 -readonly common_aosp_branch=android14-qpr3-release # Sep 2024 +readonly common_aosp_branch=android15-release # Sep 2024 -readonly prev_common_aosp_tag=android-14.0.0_r55 # Aug 2024, Pixel 5a, 7, 8 -readonly common_aosp_tag=android-14.0.0_r67 # Sep 2024, Pixel 7, 8 +readonly prev_common_aosp_tag=android-14.0.0_r67 # Sep 2024, Pixel 7, 8 +readonly common_aosp_tag=android-15.0.0_r1 # Sep 2024 -readonly common_aosp_build_id=AP2A.240905.003 # Sep 2024, Pixel 7, 8 +readonly common_aosp_build_id=AP3A.240905.015.A2 # Sep 2024 readonly topic=sep24 -readonly lineageos_branch=lineage-21.0 -readonly lineageos_device_branch=lineage-21 +readonly lineageos_branch=lineage-22.0 +readonly lineageos_device_branch=lineage-22.0 readonly merge_method="merge" From d7edca0164b816e28ec02ea0db21be5b4227df14 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 15 Oct 2024 22:17:00 +0530 Subject: [PATCH 057/111] October 2024 Security update, Android 15 for the Pixels Change-Id: I7ca4ec030643a668eda4c86e4ed5c6e54763afcf --- vars/akita | 22 +++++++++++----------- vars/bluejay | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/common | 8 ++++---- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- 12 files changed, 125 insertions(+), 125 deletions(-) diff --git a/vars/akita b/vars/akita index 480b98a3..1e7ad314 100644 --- a/vars/akita +++ b/vars/akita @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003.A1" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r56" -readonly aosp_tag="android-14.0.0_r68" +readonly prev_aosp_tag="android-14.0.0_r68" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12234140" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap2a.240905.003.a1-factory-39b3cda7.zip" -readonly image_sha256="39b3cda7efbf57e8d5656def2d3ad0e190871a42d34021eaee55e467fd1f359b" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap3a.241005.015-factory-e5b2c13f.zip" +readonly image_sha256="e5b2c13f176a26007f30d685266ddc1bbc971ddc8fdeb7e3c62ff236f3a969cf" -readonly flash_url="https://flash.android.com/build/12234140?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap2a.240905.003.a1-02dd5149.zip" -readonly ota_sha256="02dd514973798b0d922a0b171a51ec8b8cfc2eaf913e30e7bb97a115998deb5c" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap3a.241005.015-e26191f3.zip" +readonly ota_sha256="e26191f38fdb04f259a82d8840816ad8e8e02c1185357389edac597fe5e8dd8f" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/bluejay b/vars/bluejay index 0d89ee45..a7a53b1e 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003.F1" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r61" -readonly aosp_tag="android-14.0.0_r73" +readonly prev_aosp_tag="android-14.0.0_r73" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12235381" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap2a.240905.003.f1-factory-ccb9246b.zip" -readonly image_sha256="ccb9246b90b5e89e46ff6af7196a9e11eec453104012fa1290efed6e7a8d2fbe" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap3a.241005.015-factory-9c97e72b.zip" +readonly image_sha256="9c97e72beec9ced2c089a2de1190b266348f7921d16f24463304ba3b7f832421" -readonly flash_url="https://flash.android.com/build/12235381?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap2a.240905.003.f1-bc5a699a.zip" -readonly ota_sha256="bc5a699a4d37ae146c56b499ce9a7742c1d72bc9e1977859c71378321c3407d3" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap3a.241005.015-6f398595.zip" +readonly ota_sha256="6f398595f9b21e368ac4e9440108d20fa269d1ebf76c2f51978553df5b420f25" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/cheetah b/vars/cheetah index ea80a4ff..2dc0db7b 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap2a.240905.003-factory-ba67b76e.zip" -readonly image_sha256="ba67b76ea0f43f5d827898094b3bfd8d5af9368c486719e15a48ce3cdfacb5d2" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap3a.241005.015-factory-d9526665.zip" +readonly image_sha256="d9526665b5b1e4e6ad631e9e9d267e7a89f2be8b642505ed90761634a6b2a957" -readonly flash_url="https://flash.android.com/build/12231197?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap2a.240905.003-be18c366.zip" -readonly ota_sha256="be18c366e7e374d9ba3001af83efe7bd1d6e3292b691224761fbd7c0f2a19cdf" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap3a.241005.015-80681262.zip" +readonly ota_sha256="806812623c08693035a2e35dc5a554aa9a3edeab8cc48ed4ae2695788c3a6c3b" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/common b/vars/common index ef502f85..8b6d870d 100644 --- a/vars/common +++ b/vars/common @@ -7,12 +7,12 @@ readonly device_branch=staging/android15 readonly common_aosp_branch=android15-release # Sep 2024 -readonly prev_common_aosp_tag=android-14.0.0_r67 # Sep 2024, Pixel 7, 8 -readonly common_aosp_tag=android-15.0.0_r1 # Sep 2024 +readonly prev_common_aosp_tag=android-15.0.0_r1 # Sep 2024, AOSP +readonly common_aosp_tag=android-15.0.0_r2 # Oct 2024, Pixel 6 - 9 -readonly common_aosp_build_id=AP3A.240905.015.A2 # Sep 2024 +readonly common_aosp_build_id=AP3A.241005.015 # Oct 2024, Pixel 6 - 9 -readonly topic=sep24 +readonly topic=oct24 readonly lineageos_branch=lineage-22.0 readonly lineageos_device_branch=lineage-22.0 diff --git a/vars/felix b/vars/felix index 1758c2bf..7e5f251c 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap2a.240905.003-factory-e9cd2949.zip" -readonly image_sha256="e9cd2949bf406cf621b39b89431423bcc1d36e189548478781e18774d7e70b3b" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap3a.241005.015-factory-40bbce3a.zip" +readonly image_sha256="40bbce3a4c0650ce7f21ae49c5511ab86e1b84072e5f8d30ce91bbf596a1556d" -readonly flash_url="https://flash.android.com/build/12231197?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap2a.240905.003-ec33d3fa.zip" -readonly ota_sha256="ec33d3faa51073e377612d600e303bf392d64b5adc43097c7a3fc59b8ecca14d" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap3a.241005.015-c47e61ee.zip" +readonly ota_sha256="c47e61ee985c095916b7435bf70611035643568bf7758e3d5bc1de596e9a2ead" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/husky b/vars/husky index 38766ad0..e808c02e 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap2a.240905.003-factory-3d55ebeb.zip" -readonly image_sha256="3d55ebeba69775da9e7443f3046f3a4931d9453a7e5fd050fe1f0721c34cbd1e" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap3a.241005.015-factory-95430bca.zip" +readonly image_sha256="95430bca928b1ceb7a6620c2c8aa467dc3a302ec28c56332de917b5e6502a524" -readonly flash_url="https://flash.android.com/build/12231197?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap2a.240905.003-b20862e1.zip" -readonly ota_sha256="b20862e1a8eb63fccca0219ee8651cf8e3542d9c5f3aa7161f93e3c7f4c201a1" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap3a.241005.015-0fbf8483.zip" +readonly ota_sha256="0fbf8483ea48856e12811e6353ddd355ac4db6ff53c0fa005109b98839b8110d" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/lynx b/vars/lynx index 43b7f521..82a00a5f 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap2a.240905.003-factory-e2128987.zip" -readonly image_sha256="e2128987957fa1e9ac54cae9ef25c6031af231c2aecd2dbebd3b2a19e7d180b5" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap3a.241005.015-factory-9765a172.zip" +readonly image_sha256="9765a17219b297ebcceb3c4cfa65dc71652c7a584a5181791d585c4478989d4e" -readonly flash_url="https://flash.android.com/build/12231197?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap2a.240905.003-5eaf66b1.zip" -readonly ota_sha256="5eaf66b158244d157d6f5e0cefe592c25f9c5dad05359a76f47f0efb756a634c" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap3a.241005.015-0e0cf7e0.zip" +readonly ota_sha256="0e0cf7e0746abeb3632bd81afbe556bbf2f9831c8e4eafc5c912ff33d1cf8a3b" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/oriole b/vars/oriole index d3ee1307..4dd6504f 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003.F1" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r61" -readonly aosp_tag="android-14.0.0_r73" +readonly prev_aosp_tag="android-14.0.0_r73" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12235381" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap2a.240905.003.f1-factory-655c44e7.zip" -readonly image_sha256="655c44e70a394801d9ea0108f1959fbc0f7143dce6b000440ef47a30b95a20bb" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap3a.241005.015-factory-0c6a9064.zip" +readonly image_sha256="0c6a90646fa30ac2d28a711b9a56bb5470b58cd998ad5e4c4dcaecdd7496abbf" -readonly flash_url="https://flash.android.com/build/12235381?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap2a.240905.003.f1-b4ca07c7.zip" -readonly ota_sha256="b4ca07c790a86d63b02365fd415851c433e9377e40888fb537cb28c34ddea8fd" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap3a.241005.015-35b1560c.zip" +readonly ota_sha256="35b1560ca59fc2ff4fc6e9cb3f7132bf77214928993b55e169588c8ebad3f125" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/panther b/vars/panther index d0fd7a40..c80d7707 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap2a.240905.003-factory-55a88575.zip" -readonly image_sha256="55a8857543f686b0888dcbd5dc5621f54e327bb1c4bfbc73dcbb8eebcee3d4bc" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap3a.241005.015-factory-0418766c.zip" +readonly image_sha256="0418766c3333b58172a29ad72c717ba034fef28a3f83c76981d2822a2ca02a7c" -readonly flash_url="https://flash.android.com/build/12231197?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap2a.240905.003-7319d2fd.zip" -readonly ota_sha256="7319d2fdccc80f0477cc0de8804e710988d986332bf69704545722ddf8da6367" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap3a.241005.015-59cef26e.zip" +readonly ota_sha256="59cef26e514fc0c2704c5960ac1329d4c84067ae3d0271d5c0ad2c420594d7bd" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/raven b/vars/raven index 90b17b38..1a9a3559 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003.F1" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r61" -readonly aosp_tag="android-14.0.0_r73" +readonly prev_aosp_tag="android-14.0.0_r73" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12235381" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap2a.240905.003.f1-factory-c3298655.zip" -readonly image_sha256="c329865565a3ebf04b17a8005e388da7e237a79644b86fba4451bd7cdbd8966e" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap3a.241005.015-factory-b8d2d653.zip" +readonly image_sha256="b8d2d653251603a7253e1f85ac752ddd684acffeafc5450128ba43b87519e17e" -readonly flash_url="https://flash.android.com/build/12235381?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap2a.240905.003.f1-aafe9427.zip" -readonly ota_sha256="aafe9427c69c5e7ea8bbc0fc8c5d4bb9025a8938994b759503d9b4b0c2ee724e" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap3a.241005.015-0dbde992.zip" +readonly ota_sha256="0dbde9927bcfa27a8f16462ae51511ec9575ba9e5e8188c02e1e684918cdf049" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/shiba b/vars/shiba index 6f3532fa..3204b9c5 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap2a.240905.003-factory-e3f78b31.zip" -readonly image_sha256="e3f78b3156ad883bf1c540c125827fcdc0705474f2624f28e9ec6cdb0c6fd850" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap3a.241005.015-factory-8061edde.zip" +readonly image_sha256="8061edde9ea228acd3cd54085c138a1e1c72b2c7c0ae4997539b451ce262b532" -readonly flash_url="https://flash.android.com/build/12231197?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap2a.240905.003-fccccd6f.zip" -readonly ota_sha256="fccccd6f7b62048c317fb6c48536afbbbb5b58940a4da64490c4e35ec4f8f747" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap3a.241005.015-b583f50a.zip" +readonly ota_sha256="b583f50abbcb50c7466249ce4837b05ee6bd54c67813ea4da7d80cc88cc5ed79" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" diff --git a/vars/tangorpro b/vars/tangorpro index e79e8841..36ad070e 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240905.003" +readonly build_id="AP3A.241005.015" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r55" -readonly aosp_tag="android-14.0.0_r67" +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" -readonly build_number="12231197" +readonly build_number="12366759" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap2a.240905.003-factory-f4e19247.zip" -readonly image_sha256="f4e192474ac4554d8e8ce5c0723b6b9b42d973d24e614d64518d78f7b033283a" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap3a.241005.015-factory-70bcf7f4.zip" +readonly image_sha256="70bcf7f432921a84bfedd6e8b226196a58c6ebb142914717749404ae61bac9c2" -readonly flash_url="https://flash.android.com/build/12231197?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12366759?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap2a.240905.003-4d96c06a.zip" -readonly ota_sha256="4d96c06a4ae5808ffff6c6a3dd63f214e3ddb9267f18d374878d911c67a0ee61" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap3a.241005.015-56044903.zip" +readonly ota_sha256="5604490361420e12d5d7088c76d9c998c9cd6acc1c029d76f0d3baef1ebd1384" -readonly security_patch="2024-09-05" +readonly security_patch="2024-10-05" From da32d55f80b6ae6d20e18af8bb18bd77a0b40e31 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 15 Oct 2024 21:26:36 +0300 Subject: [PATCH 058/111] aosp-merger: Make it work during bringup Don't depend on our custom AOSP envsetup changes Change-Id: I39f0a82f92e44c1b4eed0f0f0633184d1c752eda --- aosp-merger/_merge_helper.sh | 2 ++ aosp-merger/_subtree_merge_helper.sh | 2 ++ aosp-merger/push-merge.sh | 2 ++ aosp-merger/push-upstream.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index cca88d35..cb5252b8 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -65,6 +65,8 @@ TOP="${script_path}/../../.." # Source build environment (needed for aospremote/lineageremote) source "${TOP}/build/envsetup.sh" +export ANDROID_BUILD_TOP=$(gettop) +source "${TOP}/vendor/calyx/build/envsetup.sh" BRANCH="${os_branch}" STAGINGBRANCH="staging/${BRANCHSUFFIX}" diff --git a/aosp-merger/_subtree_merge_helper.sh b/aosp-merger/_subtree_merge_helper.sh index 67532b95..99369c5a 100755 --- a/aosp-merger/_subtree_merge_helper.sh +++ b/aosp-merger/_subtree_merge_helper.sh @@ -60,6 +60,8 @@ TOP="${script_path}/../../.." # Source build environment (needed for aospremote) source "${TOP}/build/envsetup.sh" +export ANDROID_BUILD_TOP=$(gettop) +source "${TOP}/vendor/calyx/build/envsetup.sh" BRANCH="${os_branch}" STAGINGBRANCH="staging/${BRANCHSUFFIX}" diff --git a/aosp-merger/push-merge.sh b/aosp-merger/push-merge.sh index c65a24eb..8625b466 100755 --- a/aosp-merger/push-merge.sh +++ b/aosp-merger/push-merge.sh @@ -49,6 +49,8 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" # Source build environment (needed for calyxremote) source "${TOP}/build/envsetup.sh" +export ANDROID_BUILD_TOP=$(gettop) +source "${TOP}/vendor/calyx/build/envsetup.sh" # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') diff --git a/aosp-merger/push-upstream.sh b/aosp-merger/push-upstream.sh index 3e57eeb9..c0deac86 100755 --- a/aosp-merger/push-upstream.sh +++ b/aosp-merger/push-upstream.sh @@ -47,6 +47,8 @@ TOP="${script_path}/../../.." # Source build environment (needed for calyxremote) source "${TOP}/build/envsetup.sh" +export ANDROID_BUILD_TOP=$(gettop) +source "${TOP}/vendor/calyx/build/envsetup.sh" # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') From 4bbb065078dc363c3dda2ded86ffcc641d3b7f30 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 17 Oct 2024 16:59:47 +0300 Subject: [PATCH 059/111] pixel: Adapt to new build prop override scheme Change-Id: I248b2bda209f72e3e1270879792bf42480255c17 --- pixel/build-desc-fingerprint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pixel/build-desc-fingerprint.sh b/pixel/build-desc-fingerprint.sh index 2ffed932..9cb71766 100755 --- a/pixel/build-desc-fingerprint.sh +++ b/pixel/build-desc-fingerprint.sh @@ -65,10 +65,10 @@ main() { local dv="${vars_path}/${d}" source "${dv}" local mk="$(ls ${top}/device/google/*/calyx_${d}.mk)" - desc="${d}-user ${android_version} ${build_id} ${build_number} release-keys" + desc="${d}-user[[:space:]]${android_version}[[:space:]]${build_id}[[:space:]]${build_number}[[:space:]]release-keys" fingerprint="google/${d}/${d}:${android_version}/${build_id}/${build_number}:user/release-keys" - sed -i "/PRIVATE_BUILD_DESC/c\ PRIVATE_BUILD_DESC=\"${desc}\"" "${mk}" - sed -i "/BUILD_FINGERPRINT/c\BUILD_FINGERPRINT\ :=\ ${fingerprint}" "${mk}" + sed -i "/BuildDesc/c\ BuildDesc=${desc} \\\\" "${mk}" + sed -i "/BuildFingerprint/c\ BuildFingerprint=${fingerprint} \\\\" "${mk}" ) done From d34faaa7172610c723c5cfa9d9ffaf09943c5c82 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 25 Oct 2024 21:54:47 +0300 Subject: [PATCH 060/111] pixel: Adapt to new build prop override scheme again Change-Id: I253f21db89f053bcfe543d6494a8ef5f8209e93b --- pixel/build-desc-fingerprint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixel/build-desc-fingerprint.sh b/pixel/build-desc-fingerprint.sh index 9cb71766..520c57a4 100755 --- a/pixel/build-desc-fingerprint.sh +++ b/pixel/build-desc-fingerprint.sh @@ -65,9 +65,9 @@ main() { local dv="${vars_path}/${d}" source "${dv}" local mk="$(ls ${top}/device/google/*/calyx_${d}.mk)" - desc="${d}-user[[:space:]]${android_version}[[:space:]]${build_id}[[:space:]]${build_number}[[:space:]]release-keys" + desc="${d}-user ${android_version} ${build_id} ${build_number} release-keys" fingerprint="google/${d}/${d}:${android_version}/${build_id}/${build_number}:user/release-keys" - sed -i "/BuildDesc/c\ BuildDesc=${desc} \\\\" "${mk}" + sed -i "/BuildDesc/c\ BuildDesc=\"${desc}\" \\\\" "${mk}" sed -i "/BuildFingerprint/c\ BuildFingerprint=${fingerprint} \\\\" "${mk}" ) done From 686c77420beb80a4ff32a7b69f0c69cde8ad0efb Mon Sep 17 00:00:00 2001 From: Tommy Webb Date: Wed, 6 Nov 2024 16:29:05 +0000 Subject: [PATCH 061/111] Initial check-in of signing verification scripts Issue: calyxos#2781 Change-Id: I67a8b039bff9e0e5073bfbadcf86ba342edd7304 --- misc/check_keys.sh | 453 +++++++++++++++++++++++++++++++++++++++++++ misc/install_test.sh | 56 ++++++ 2 files changed, 509 insertions(+) create mode 100755 misc/check_keys.sh create mode 100755 misc/install_test.sh diff --git a/misc/check_keys.sh b/misc/check_keys.sh new file mode 100755 index 00000000..28d3f5db --- /dev/null +++ b/misc/check_keys.sh @@ -0,0 +1,453 @@ +#!/bin/bash +set -euo pipefail + +error() { + printf "%s\n" "$*" >&2 + exit 1 +} + +help() { + # For convenience, the examples shown will fill in the actual current values of variables + # DEVICE and BUILD_NUMBER when available. When not available, they'll appear as variables. + local DEVICE="${DEVICE:-\$DEVICE}" + local BUILD_NUMBER="${BUILD_NUMBER:-\$BUILD_NUMBER}" + echo "Usage: $0 (app|gen_allowlist|target_files) path [path...]" + echo + echo "This tool checks the signing keys used for the given path(s) against a user-provided " + echo "list of allowed or denied fingerprints. This list can be generated with gen_allowlist, " + echo "and then the whole list (newline-separated) provided in either the ALLOWED_FINGERPRINTS or " + echo "DENIED_FINGERPRINTS environment variables." + echo + echo "Example allowlist usage:" + echo " # on the signing server" + echo " $0 gen_allowlist keys/$DEVICE keys/common | sort -u > allowed-keys-$DEVICE.txt" + echo ' ALLOWED_FINGERPRINTS="$(cat allowed-keys-$DEVICE.txt)" '"$0"' target_files \' + echo " "'"'"archive/release-$DEVICE-$BUILD_NUMBER/$DEVICE-target_files-$BUILD_NUMBER.zip"'"' + echo + echo "Example denylist usage:" + echo " # on the build server" + echo " $0 gen_allowlist calyx/keys/aosp-test-keys/* | sort -u > aosp-test-keys.txt" + echo " # copy aosp-test-keys.txt to signing server" + echo " # on the signing server" + echo ' DENIED_FINGERPRINTS="$(cat aosp-test-keys.txt)" '"$0"' target_files \' + echo " "'"'"archive/release-$DEVICE-$BUILD_NUMBER/$DEVICE-target_files-$BUILD_NUMBER.zip"'"' +} + +readonly -a SIGNED_TYPES=('*.apk' '*.apex' '*.capex' 'original_apex') +readonly -a SIGNATURE_FILES=('META-INF/*.RSA') +readonly ERROR_TESTKEY=42 +readonly ERROR_EXTRACTION_FAILED=43 +readonly ERROR_FINGERPRINT=44 + +# ALLOWED_FINGERPRINTS or DENIED_FINGERPRINTS, one per line +# see gen_allowlist +declare -a allowed_fingerprints=() +declare -a denied_fingerprints=() +[ -z "${ALLOWED_FINGERPRINTS:-}" ] || readarray -d $'\n' -t allowed_fingerprints <<< "${ALLOWED_FINGERPRINTS:-}" +[ -z "${DENIED_FINGERPRINTS:-}" ] || readarray -d $'\n' -t denied_fingerprints <<< "${DENIED_FINGERPRINTS:-}" + +readarray -t ignore_patterns <<< "${IGNORE_PATTERNS:-}" +if [ -z "${IGNORE_PATTERNS:-}" ]; then + # Default ignore patterns + ignore_patterns=( + # F-Droid repo apps are pre-signed + 'PRODUCT/fdroid/repo/*' + + # cts shim is always test key + 'SYSTEM/apex/com.android.apex.cts.shim.apex' + + # vendor-provided apps are pre-signed + 'PRODUCT/priv-app/EuiccGoogle/*' + 'PRODUCT/priv-app/PixelCameraServices/*' + 'SYSTEM_EXT/priv-app/EuiccSupportPixel/*' + 'SYSTEM_EXT/priv-app/EuiccSupportPixelPermissions/*' + 'SYSTEM_EXT/priv-app/OemRilService/*' + 'SYSTEM_EXT/priv-app/ShannonIms/*' + 'SYSTEM_EXT/priv-app/ShannonQualifiedNetworksService/*' + 'SYSTEM_EXT/priv-app/ShannonRcs/*' + 'VENDOR/apex/com.google.android.widevine*' + 'VENDOR/apex/com.google.pixel.euicc.update.apex' + 'VENDOR/apex/com.google.pixel.wifi.ext.apex' + 'VENDOR/apex/com.google.pixel.camera.hal.apex' + ) +fi + +# can be allowlist, denylist, or testkeys-old (not recommended) +# will be computed in main if unspecified +CHECK_MODE="${CHECK_MODE:-}" + +gen_allowed_fingerprints() { + local cert + local -a allowed_fingerprints + local keys_path="$1" + for cert in "${keys_path}"/*.x509.pem; do + local fingerprint="$(cat "$cert" | openssl x509 -inform PEM -fingerprint -sha256 | head -n1 | tr '[A-Z]' '[a-z]' | sed -e 's/://g' -e 's/^sha256 fingerprint=/SHA-256:/')" + local fp + for fp in "${allowed_fingerprints[@]}"; do + [ -n "$fingerprint" ] || break + if [ "$fp" = "$fingerprint" ]; then + # already exists + fingerprint= + fi + done + if [ -n "$fingerprint" ]; then + allowed_fingerprints+=("$fingerprint") + fi + done + printf "%s\n" "${allowed_fingerprints[@]}" +} + +find_apksigner() { + apksigner="${APKSIGNER_COMMAND:-}" + if [ -e "$apksigner" ]; then + return 0 + fi + apksigner="$(which apksigner || true)" + if [ -z "$apksigner" ]; then + if [ -f "$(pwd)/bin/apksigner" ]; then + apksigner="$(pwd)/bin/apksigner" + elif [ -f "$HOME/androidsign/bin/apksigner" ]; then + apksigner="$HOME/androidsign/bin/apksigner" + fi + fi + if [ ! -f "$apksigner" ]; then + echo "Could not find apksigner tool" >&2 + return 1 + fi +} + +find_deapexer() { + deapexer="${DEAPEXER_COMMAND:-}" + if [ -e "$deapexer" ]; then + return 0 + fi + deapexer="$(which deapexer || true)" + if [ -z "$deapexer" ]; then + if [ -f "$(pwd)/bin/deapexer" ]; then + deapexer="$(pwd)/bin/deapexer" + elif [ -f "$HOME/androidsign/bin/deapexer" ]; then + deapexer="$HOME/androidsign/bin/deapexer" + fi + fi + if [ ! -f "$deapexer" ]; then + echo "Could not find deapexer tool" >&2 + return 1 + fi +} + +apksigner() { + command "$apksigner" "$@" +} + +deapex() { + local parentdir="$(dirname "$deapexer")" + "$deapexer" --fsckerofs_path "$parentdir/fsck.erofs" --debugfs_path "$parentdir/debugfs_static" "$@" +} + +main() { + if [ $# -eq 0 ]; then + help + exit 0 + fi + case "${1:-}" in + -h|--help|help) + help + exit 0 + ;; + esac + + if [ -z "$CHECK_MODE" ]; then + local num_allowed=${#allowed_fingerprints[@]} + local num_denied=${#denied_fingerprints[@]} + if [ $num_allowed -gt 0 ] && [ $num_denied -gt 0 ]; then + error "Expected only one of ALLOWED_FINGERPRINTS or DENIED_FINGERPRINTS environment variables," \ + "or to choose allowlist/denylist explicitly via CHECK_MODE variable" + exit 1 + fi + if [ $num_allowed -gt 0 ]; then + CHECK_MODE=allowlist + else + CHECK_MODE=denylist + fi + fi + + case "$CHECK_MODE" in + allowlist|denylist) + find_apksigner + ;; + esac + + find_deapexer + + case "${1:-}" in + app) + shift 1 + local app="$1" + # first arg is used as a name for the app, which here is the same as the filename + handle_app "$app" "" "$@" || return $? + ;; + target_files) + shift 1 + handle_target_files "$@" || return $? + ;; + gen_allowlist) + shift 1 + local allowed_fingerprints_per_dir=() + for dir in "$@"; do + allowed_fingerprints_per_dir+=("$(gen_allowed_fingerprints "$dir")") + printf "%s\n" "${allowed_fingerprints_per_dir[@]}" | sort -u + done + echo "Try setting these to the ALLOWED_FINGERPRINTS variable" >&2 + echo 'e.g. check_keys gen_allowlist [...] > allowlist.txt; export ALLOWED_FINGERPRINTS="$(cat allowlist.txt)"' >&2 + ;; + *) + help >&2 + error "Mode must be one of: app, gen_allowlist, target_files" + ;; + esac + + return $? +} + +check_signature_of_package() { + local app="$1" + local subapp="$2" + local file="$3" + local err=0 + local result="$(apksigner verify --print-certs "$file" 2>&1)" || err=$? + if [ $err -ne 0 ]; then + # apksigner failed; dump its full output + printf "%s\n" "$result" >&2 + return $err + fi + + local -a signer_certificates + local cert + while IFS= read -r cert; do + signer_certificates+=("$cert") + case "$CHECK_MODE" in + allowlist) + for allowed_cert in "${allowed_fingerprints[@]}"; do + if [ "$allowed_cert" = "$cert" ]; then + return 0 + fi + done + ;; + denylist) + for denied_cert in "${denied_fingerprints[@]}"; do + if [ "$denied_cert" = "$cert" ]; then + return $ERROR_FINGERPRINT + fi + done + ;; + esac + done < <(printf "%s\n" "$result" | parse_signer_certificates) + + case "$CHECK_MODE" in + allowlist) + echo "No matching certs for $app ($subapp):" >&2 + printf " %s\n" "${signer_certificates[@]}" >&2 + return $ERROR_FINGERPRINT + esac +} + +parse_signer_certificates() { + sed -n -e 's/^Signer.* certificate \(.*\) digest: \(.*\)/\1:\2/p' +} + +handle_app() { + local err=0 + local app="$1" + local subapp="$2" + check_subapps="$check_subapps" \ + handle_app_internal "$@" || err=$? + case $err in + $ERROR_TESTKEY) + echo "TEST KEYS IN USE FOR $app OR FILES CONTAINED WITHIN" >&2 + ;; + $ERROR_EXTRACTION_FAILED) + echo "Failed to extract signature for $app" >&2 + ;; + $ERROR_FINGERPRINT) + case "$CHECK_MODE" in + allowlist) + echo "Fingerprint not found on allowlist: $app" >&2 + ;; + denylist) + echo "Fingerprint found on denylist: $app" >&2 + ;; + esac + ;; + 0) + true + ;; + *) + echo "Failed to validate signature for $app" >&2 + ;; + esac + # output a line to stdout representing the failed app + if [ $err -ne 0 ]; then + printf "%s\n" "$app" + return $err + fi +} + +handle_app_internal() { + local app="$1" + local subapp="$2" + #case "$(basename "$app")" in + # com.android.apex.cts.shim.apex) + # echo "Skipping signature check for cts shim, as it is meant to use a throwaway key: $app" >&2 + # return 0 + # ;; + #esac + local file="$3" + local extract_ok + local err=0 + case "$CHECK_MODE" in + testkeys-old) + for sig in "${SIGNATURE_FILES[@]}"; do + unzip -p "$file" "$sig" 2>/dev/null | check_signature_stdin + err=${PIPESTATUS[1]:-$?} + if [ ${PIPESTATUS[0]} -ne 0 ]; then + return $ERROR_EXTRACTION_FAILED + elif [ $err -ne 0 ]; then + return $err + fi + done + ;; + *) + check_signature_of_package "$app" "$subapp" "$file" || return $? + ;; + esac + if [ "$check_subapps" = "y" ]; then +# echo $app $file >&2 + local subapps + #zipinfo -1 "$file" "${SIGNED_TYPES[@]}" 1>&2 + case "$file" in + *.apex|*original_apex) + local tmpdir="$(mktemp -d)" + deapex extract "$file" "$tmpdir" >&2 || { rm -rf "$tmpdir"; return $ERROR_EXTRACTION_FAILED; } + #ls -lR "$tmpdir" + for signed_type in "${SIGNED_TYPES[@]}"; do + local -a subfiles + readarray -d '' subfiles < <(find "$tmpdir" -name "$signed_type" -print0) + local subfile + for subfile in "${subfiles[@]}"; do + cp -a "$subfile" ~/blah.apk + check_subapps=y \ + handle_app_internal "$app" "$subfile" "$subfile" || { err=$?; break; } + done + done + rm -rf "$tmpdir" + if [ $err -ne 0 ]; then + echo "Error $err encountered with subfile: $subfile" >&2 + fi + return $err + ;; + esac + readarray -t subapps < <(zipinfo -1 "$file" "${SIGNED_TYPES[@]}" 2>/dev/null) + local subapp + for subapp in "${subapps[@]}"; do + #echo "$subapp" >&2 + local subfile="$(mktemp_with_extension "${subapp##*.}")" + unzip -p "$file" "$subapp" > "$subfile" || { rm -f "$subfile"; continue; } + check_subapps=y \ + handle_app_internal "$app" "$subapp" "$subfile" || { err=$?; rm -f "$subfile"; break; } + rm -f "$subfile" + done + if [ $err -ne 0 ]; then + echo "Error $err encountered with subfile: $subfile" >&2 + fi + fi + return $err +} + +mktemp_with_extension() { + local tmpfile="$(mktemp)" || return $? + mv "$tmpfile" "${tmpfile}.$1" || return $? + printf "%s\n" "${tmpfile}.$1" +} + +handle_target_files() { + local target_files_zip="$1" + shift 1 + local -a apps=() + if [ $# -eq 0 ]; then + readarray -t apps < <(zipinfo -1 "$target_files_zip" "${SIGNED_TYPES[@]}" 2>/dev/null) + #readarray -t apps < <(zipinfo -1 "$target_files_zip" "SYSTEM/apex/com.android.appsearch.capex" 2>/dev/null) + else + local apps=("$@") + fi + local -a failed_apps=() + + if [ "${#apps[@]}" -gt 1 ]; then + local output=$(printf "%s\n" "${apps[@]}" | parallel "$0" target_files "$target_files_zip" || return $?) + # the presence of any output from parallel is considered an error, because stdout lists failed apps. + # stderr includes more details and is not inhibited by the above capture. + if [ -n "$output" ]; then + echo >&2 + echo "FINGERPRINT ISSUES FOUND WITH:" >&2 + printf "%s\n" "$output" + return 1 + fi + return $? + fi + + local app="${apps[0]}" + local err=0 + local check_subapps= + local tmpfile="$(mktemp_with_extension "${app##*.}")" + local ignored_path= + for ignored_path in "${ignore_patterns[@]}"; do + case "$app" in + $ignored_path) + #echo "Ignored path, boom: $app $ignored_path" >&2 + break + ;; + esac + ignored_path= + done + if [ -n "$ignored_path" ]; then + return 0 + fi + unzip -p "$target_files_zip" "$app" > "$tmpfile" || { rm "$tmpfile"; continue; } + case "$app" in + *.capex|*.apex) + check_subapps=y + ;; + *) + check_subapps=n + ;; + esac + check_subapps="$check_subapps" \ + handle_app "$app" "" "$tmpfile" || err=$? + rm -f "$tmpfile" + return $err +} + +check_signature_stdin() { + # testkey subject and issuer are: + # C = US, ST = California, L = Mountain View, O = Android, OU = Android, CN = Android, emailAddress = android@android.com + # And for APEX: + # C = US, ST = California, L = Mountain View, O = Google Inc., OU = Android, CN = com.android + case "$CHECK_MODE" in + testkeys-old) + local result="$(decode_app_signature_stdin)" + #printf "%s\n" "$result" | head -n100 >&2 + if printf "%s\n" "$result" | grep -q 'android@android\.com\|C = US, ST = California, L = Mountain View, O = Google Inc\., OU = Android, CN = com\.android'; then + return $ERROR_TESTKEY + fi + return $? + ;; + *) + error "This should not happen" + ;; + esac +} + +decode_app_signature_stdin() { + openssl pkcs7 -inform DER -text -print_certs 2>/dev/null +} + +main "$@" || exit $? diff --git a/misc/install_test.sh b/misc/install_test.sh new file mode 100755 index 00000000..ebe80919 --- /dev/null +++ b/misc/install_test.sh @@ -0,0 +1,56 @@ +#!/bin/bash +set -euo pipefail + +help() { + echo 'This script attempts to install APKs and APEXes from the build output directory, $OUT, ' + echo 'with the expectation that they are not yet production-signed. It is used to ensure that ' + echo 'packages signed with test keys fail to install, as expected.' + echo + echo 'It is normal for some packages, such as vendor packages, to be presigned. Warnings about ' + echo 'packages known to be presigned can be safely ignored.' +} + +case "${1:-}" in + -h|--help) + help + exit 0 + ;; +esac + +[ -n "$OUT" ] || { echo "OUT is not set" >&2; help >&2; exit 1; } + +IGNORE_PATTERNS=( + 'product/fdroid/*' +) +files=() + +cd "$OUT" + +for d in apex product system system_ext vendor; do + readarray -t -d '' new_paths < <(find $d/ -name '*.apk' -print0) + files+=(${new_paths[@]}) + readarray -t -d '' new_paths < <(find $d/ -name '*.apex' -print0) + files+=(${new_paths[@]}) + readarray -t -d '' new_paths < <(find $d/ -name '*.capex' -print0) + files+=(${new_paths[@]}) +done + +for file in "${files[@]}"; do + for ignore_pattern in "${IGNORE_PATTERNS[@]}"; do + case "$file" in + $ignore_pattern) + # skip it (ignore_pattern will not be blank, so will continue below) + break + ;; + esac + ignore_pattern= + done + if [ -n "$ignore_pattern" ]; then + continue + fi + err=0 + result="$(adb install "$file" 2>&1)" || err=$? + if [ $err -eq 0 ]; then + printf "WARNING: successfully installed %s\n" "$file" + fi +done From 691b07bfe677086cc5f6742f84bc9aeac5e2b978 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 7 Nov 2024 02:17:12 +0530 Subject: [PATCH 062/111] November 2024 Security update Change-Id: I284ac36cf0ec0f059e9d022f7d731171b2ae8ac2 --- vars/akita | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- 12 files changed, 115 insertions(+), 115 deletions(-) diff --git a/vars/akita b/vars/akita index 1e7ad314..1e31d778 100644 --- a/vars/akita +++ b/vars/akita @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r68" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap3a.241005.015-factory-e5b2c13f.zip" -readonly image_sha256="e5b2c13f176a26007f30d685266ddc1bbc971ddc8fdeb7e3c62ff236f3a969cf" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap3a.241105.007-factory-680e6948.zip" +readonly image_sha256="680e69480d997c375eb5f6b6ab4685e1cab86a7fa88f1f4d0272291c171cdeab" -readonly flash_url="https://flash.android.com/build/12366759?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap3a.241005.015-e26191f3.zip" -readonly ota_sha256="e26191f38fdb04f259a82d8840816ad8e8e02c1185357389edac597fe5e8dd8f" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap3a.241105.007-38cfd2b5.zip" +readonly ota_sha256="38cfd2b5c0ac39682c38fab939413790f05364a1ab46cb58b1d3b41fa20f1564" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/bluejay b/vars/bluejay index a7a53b1e..e6d51169 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r73" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap3a.241005.015-factory-9c97e72b.zip" -readonly image_sha256="9c97e72beec9ced2c089a2de1190b266348f7921d16f24463304ba3b7f832421" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap3a.241105.007-factory-c657cf23.zip" +readonly image_sha256="c657cf23a3bca74d77260ca509ece8a513bc8ef80264bb591a242721ffa061de" -readonly flash_url="https://flash.android.com/build/12366759?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap3a.241005.015-6f398595.zip" -readonly ota_sha256="6f398595f9b21e368ac4e9440108d20fa269d1ebf76c2f51978553df5b420f25" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap3a.241105.007-365e6b12.zip" +readonly ota_sha256="365e6b1225cd936116e9b0cff13ba17fda8e31697dd1ce74c53b872b7f004994" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/cheetah b/vars/cheetah index 2dc0db7b..261cea0c 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap3a.241005.015-factory-d9526665.zip" -readonly image_sha256="d9526665b5b1e4e6ad631e9e9d267e7a89f2be8b642505ed90761634a6b2a957" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap3a.241105.007-factory-6e4aec19.zip" +readonly image_sha256="6e4aec19c8d1dc01ea217e37f7c9f7c2e78701927acd3106919e41cdc0223798" -readonly flash_url="https://flash.android.com/build/12366759?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap3a.241005.015-80681262.zip" -readonly ota_sha256="806812623c08693035a2e35dc5a554aa9a3edeab8cc48ed4ae2695788c3a6c3b" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap3a.241105.007-6417e400.zip" +readonly ota_sha256="6417e4005b669415c4b9d0bec6d539723833eca830369f23476d1aee664d3624" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/common b/vars/common index 8b6d870d..5a289078 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=staging/android15 readonly device_branch=staging/android15 -readonly common_aosp_branch=android15-release # Sep 2024 +readonly common_aosp_branch=android15-release # Nov 2024 -readonly prev_common_aosp_tag=android-15.0.0_r1 # Sep 2024, AOSP -readonly common_aosp_tag=android-15.0.0_r2 # Oct 2024, Pixel 6 - 9 +readonly prev_common_aosp_tag=android-15.0.0_r2 # Oct 2024, Pixel 6 - 9 +readonly common_aosp_tag=android-15.0.0_r4 # Nov 2024, Pixel 6 - 8a -readonly common_aosp_build_id=AP3A.241005.015 # Oct 2024, Pixel 6 - 9 +readonly common_aosp_build_id=AP3A.241105.007 # Nov 2024, Pixel 6 - 8a -readonly topic=oct24 +readonly topic=nov24 readonly lineageos_branch=lineage-22.0 readonly lineageos_device_branch=lineage-22.0 diff --git a/vars/felix b/vars/felix index 7e5f251c..2267859d 100644 --- a/vars/felix +++ b/vars/felix @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap3a.241005.015-factory-40bbce3a.zip" -readonly image_sha256="40bbce3a4c0650ce7f21ae49c5511ab86e1b84072e5f8d30ce91bbf596a1556d" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap3a.241105.007-factory-86022efb.zip" +readonly image_sha256="86022efbe2786d3f8c941edb6895539b6d6a08b08aedaef14c57f96b5b7c9bf7" -readonly flash_url="https://flash.android.com/build/12366759?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap3a.241005.015-c47e61ee.zip" -readonly ota_sha256="c47e61ee985c095916b7435bf70611035643568bf7758e3d5bc1de596e9a2ead" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap3a.241105.007-c9ba0974.zip" +readonly ota_sha256="c9ba0974d6614ee01e48205520f9483908e96c70497d280320c58aa893532fe4" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/husky b/vars/husky index e808c02e..b8986071 100644 --- a/vars/husky +++ b/vars/husky @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap3a.241005.015-factory-95430bca.zip" -readonly image_sha256="95430bca928b1ceb7a6620c2c8aa467dc3a302ec28c56332de917b5e6502a524" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap3a.241105.007-factory-fb1a94a5.zip" +readonly image_sha256="fb1a94a59cc17170296e38c43ee73e83609e0016b11bcb3dca48b8c3db2f4d3b" -readonly flash_url="https://flash.android.com/build/12366759?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap3a.241005.015-0fbf8483.zip" -readonly ota_sha256="0fbf8483ea48856e12811e6353ddd355ac4db6ff53c0fa005109b98839b8110d" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap3a.241105.007-65d7be98.zip" +readonly ota_sha256="65d7be989eb8c10182c2d86c371303e1487263f87259e5e1d1d0de15e64fa445" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/lynx b/vars/lynx index 82a00a5f..8bf51c8e 100644 --- a/vars/lynx +++ b/vars/lynx @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap3a.241005.015-factory-9765a172.zip" -readonly image_sha256="9765a17219b297ebcceb3c4cfa65dc71652c7a584a5181791d585c4478989d4e" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap3a.241105.007-factory-52b18be6.zip" +readonly image_sha256="52b18be632607a89ccbf667e094cc73e7af59a2edd38a75493594d2990518a8f" -readonly flash_url="https://flash.android.com/build/12366759?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap3a.241005.015-0e0cf7e0.zip" -readonly ota_sha256="0e0cf7e0746abeb3632bd81afbe556bbf2f9831c8e4eafc5c912ff33d1cf8a3b" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap3a.241105.007-26c0a712.zip" +readonly ota_sha256="26c0a712700daff8c732d613cd82630255c4866300c45374a7fe4213d0f4d01b" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/oriole b/vars/oriole index 4dd6504f..a00ea209 100644 --- a/vars/oriole +++ b/vars/oriole @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r73" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap3a.241005.015-factory-0c6a9064.zip" -readonly image_sha256="0c6a90646fa30ac2d28a711b9a56bb5470b58cd998ad5e4c4dcaecdd7496abbf" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap3a.241105.007-factory-ca5e993a.zip" +readonly image_sha256="ca5e993a45a879339bf5af759b7ca9034b560bd7cec0cf24cd6382062bda6814" -readonly flash_url="https://flash.android.com/build/12366759?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap3a.241005.015-35b1560c.zip" -readonly ota_sha256="35b1560ca59fc2ff4fc6e9cb3f7132bf77214928993b55e169588c8ebad3f125" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap3a.241105.007-e497d8e1.zip" +readonly ota_sha256="e497d8e1daf704553e34cb375b9c8d013f6821ec71ba4f6bba497ca51a6d9078" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/panther b/vars/panther index c80d7707..e3d2f3c7 100644 --- a/vars/panther +++ b/vars/panther @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap3a.241005.015-factory-0418766c.zip" -readonly image_sha256="0418766c3333b58172a29ad72c717ba034fef28a3f83c76981d2822a2ca02a7c" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap3a.241105.007-factory-05e7464e.zip" +readonly image_sha256="05e7464e01e762ed689089a0284ef8e738301b0fb1feb1c1029d202eb1d8bd6e" -readonly flash_url="https://flash.android.com/build/12366759?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap3a.241005.015-59cef26e.zip" -readonly ota_sha256="59cef26e514fc0c2704c5960ac1329d4c84067ae3d0271d5c0ad2c420594d7bd" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap3a.241105.007-fe11110e.zip" +readonly ota_sha256="fe11110ee40b0d440603ecb1a426155239fa542eb7b460000275e02205b58f2b" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/raven b/vars/raven index 1a9a3559..00e73ccc 100644 --- a/vars/raven +++ b/vars/raven @@ -11,23 +11,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r73" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap3a.241005.015-factory-b8d2d653.zip" -readonly image_sha256="b8d2d653251603a7253e1f85ac752ddd684acffeafc5450128ba43b87519e17e" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap3a.241105.007-factory-647ea40c.zip" +readonly image_sha256="647ea40c9cf31dac376f766c0537f865cce4d02a5d0cee157fc6efaedd7f5699" -readonly flash_url="https://flash.android.com/build/12366759?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap3a.241005.015-0dbde992.zip" -readonly ota_sha256="0dbde9927bcfa27a8f16462ae51511ec9575ba9e5e8188c02e1e684918cdf049" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap3a.241105.007-b3dbe78d.zip" +readonly ota_sha256="b3dbe78d4de2593bf867e8ba6685794b529f31a03a2a2f49ddd6348539a11c37" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/shiba b/vars/shiba index 3204b9c5..229319bd 100644 --- a/vars/shiba +++ b/vars/shiba @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap3a.241005.015-factory-8061edde.zip" -readonly image_sha256="8061edde9ea228acd3cd54085c138a1e1c72b2c7c0ae4997539b451ce262b532" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap3a.241105.007-factory-b9adba79.zip" +readonly image_sha256="b9adba795ccc33c312635a91a2e46eccbb49d079b7475706576c4a2bb46d4577" -readonly flash_url="https://flash.android.com/build/12366759?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap3a.241005.015-b583f50a.zip" -readonly ota_sha256="b583f50abbcb50c7466249ce4837b05ee6bd54c67813ea4da7d80cc88cc5ed79" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap3a.241105.007-85d3297d.zip" +readonly ota_sha256="85d3297d8f02f304a5b2cf4ea5545e6369f8f52b2083ae00c718201c5bd1ed32" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/tangorpro b/vars/tangorpro index 36ad070e..87267c9e 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -11,23 +11,23 @@ readonly wifi_only=true # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r4" -readonly build_number="12366759" +readonly build_number="12470370" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap3a.241005.015-factory-70bcf7f4.zip" -readonly image_sha256="70bcf7f432921a84bfedd6e8b226196a58c6ebb142914717749404ae61bac9c2" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap3a.241105.007-factory-98ec0c31.zip" +readonly image_sha256="98ec0c31b5e1e6922dd360906d250c9f622746f5a7282c0de1fd24f564f8b697" -readonly flash_url="https://flash.android.com/build/12366759?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12470370?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap3a.241005.015-56044903.zip" -readonly ota_sha256="5604490361420e12d5d7088c76d9c998c9cd6acc1c029d76f0d3baef1ebd1384" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap3a.241105.007-7157623d.zip" +readonly ota_sha256="7157623d30fde0e2dab8673f0b64a2d61060622287192308b6b3b60063ac9b12" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" From 8c72209247333dd91e3a30f65fea439fc459fd64 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 17 Sep 2024 03:50:16 +0300 Subject: [PATCH 063/111] vars: Add Pixel 9 series Change-Id: I09059d03cfcd2e305ae2fd9f060d06deac4deb04 --- vars/caiman | 31 +++++++++++++++++++++++++++++++ vars/comet | 32 ++++++++++++++++++++++++++++++++ vars/devices | 4 ++++ vars/husky | 1 - vars/komodo | 35 +++++++++++++++++++++++++++++++++++ vars/pixels | 4 ++++ vars/tokay | 31 +++++++++++++++++++++++++++++++ 7 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 vars/caiman create mode 100644 vars/comet create mode 100644 vars/komodo create mode 100644 vars/tokay diff --git a/vars/caiman b/vars/caiman new file mode 100644 index 00000000..88449372 --- /dev/null +++ b/vars/caiman @@ -0,0 +1,31 @@ +# Pixel 9 Pro + +# Usage: ${device_repos[@]} +device_repos=( + # common repos in komodo +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="AP3A.241005.015" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android15-release" + +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" + +readonly build_number="12366759" + +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap3a.241005.015-factory-78027787.zip" +readonly image_sha256="780277871f9baf483baf1e60e08dedd5d012c4db2164e8ada1c992ff1d872462" + +readonly flash_url="https://flash.android.com/build/12366759?target=caiman-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap3a.241005.015-c4aa7b6f.zip" +readonly ota_sha256="c4aa7b6f5547b3f40c0158203789ae913ed5c3fb619e6f8521526a36832b8aa6" + +readonly security_patch="2024-10-05" diff --git a/vars/comet b/vars/comet new file mode 100644 index 00000000..c3dc4cde --- /dev/null +++ b/vars/comet @@ -0,0 +1,32 @@ +# Pixel 9 Pro Fold + +# Usage: ${device_repos[@]} +device_repos=( + device/google/comet + device/google/comet-sepolicy +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="AP3A.241005.015" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android15-release" + +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" + +readonly build_number="12366759" + +readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap3a.241005.015-factory-82265301.zip" +readonly image_sha256="822653013287492f11f9541c5f555f935f8163aa18d0967dcf17c805afcfd995" + +readonly flash_url="https://flash.android.com/build/12366759?target=comet-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap3a.241005.015-5350adac.zip" +readonly ota_sha256="5350adacb10bd370b67f7120cff96975c18a14889b97a855cdd89cb53bff00bc" + +readonly security_patch="2024-10-05" diff --git a/vars/devices b/vars/devices index cfdf306e..0ebe00de 100644 --- a/vars/devices +++ b/vars/devices @@ -1,6 +1,10 @@ # All supported devices # Usage: ${devices[@]} readonly devices=( + comet + komodo + caiman + tokay akita husky shiba diff --git a/vars/husky b/vars/husky index b8986071..ecb4b79d 100644 --- a/vars/husky +++ b/vars/husky @@ -2,7 +2,6 @@ # Usage: ${device_repos[@]} device_repos=( - device/google/gs-common device/google/zuma device/google/zuma-sepolicy device/google/shusky diff --git a/vars/komodo b/vars/komodo new file mode 100644 index 00000000..55a6e6ac --- /dev/null +++ b/vars/komodo @@ -0,0 +1,35 @@ +# Pixel 9 Pro XL + +# Usage: ${device_repos[@]} +device_repos=( + device/google/gs-common + device/google/zumapro + device/google/zumapro-sepolicy + device/google/caimito + device/google/caimito-sepolicy +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="AP3A.241005.015" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android15-release" + +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" + +readonly build_number="12366759" + +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap3a.241005.015-factory-2ef380c8.zip" +readonly image_sha256="2ef380c8ded2820c017081427c4a9bec1324cf116e038cfa0d166aeb9df298ed" + +readonly flash_url="https://flash.android.com/build/12366759?target=komodo-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap3a.241005.015-56f40758.zip" +readonly ota_sha256="56f407586996c9e6aed6fe18df90febdb09dc56bbe496a9923da30d5034760b3" + +readonly security_patch="2024-10-05" diff --git a/vars/pixels b/vars/pixels index 5397c7d8..51d8665b 100644 --- a/vars/pixels +++ b/vars/pixels @@ -1,6 +1,10 @@ # Google Pixels, currently supported in AOSP # Usage: ${devices[@]} readonly devices=( + comet + komodo + caiman + tokay akita husky shiba diff --git a/vars/tokay b/vars/tokay new file mode 100644 index 00000000..102e958d --- /dev/null +++ b/vars/tokay @@ -0,0 +1,31 @@ +# Pixel 9 + +# Usage: ${device_repos[@]} +device_repos=( + # common repos in komodo +) + +readonly fbpk_version="v2" + +# Updated semi-manually via pixel/update-any-var.sh + +readonly build_id="AP3A.241005.015" + +# Updated automatically via pixel/update-device-vars.sh + +readonly aosp_branch="android15-release" + +readonly prev_aosp_tag="android-14.0.0_r67" +readonly aosp_tag="android-15.0.0_r2" + +readonly build_number="12366759" + +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap3a.241005.015-factory-88013873.zip" +readonly image_sha256="880138730c75aca3dd388759fa1711cab650aad21047889d5adf6bfa514ac87a" + +readonly flash_url="https://flash.android.com/build/12366759?target=tokay-user&signed" + +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap3a.241005.015-8894bda5.zip" +readonly ota_sha256="8894bda50281db30834bff55813ff53bcc823b39f310ebafcdaaa423e5acb01a" + +readonly security_patch="2024-10-05" From 5c2964c5ee6339c9273144fe2931a47de6d7041f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 7 Nov 2024 11:30:40 +0200 Subject: [PATCH 064/111] November 2024 Security update part 2 Change-Id: I93a986a78d5c2e8c415dd99fb40efc0583227179 --- vars/caiman | 20 ++++++++++---------- vars/comet | 20 ++++++++++---------- vars/common | 6 +++--- vars/komodo | 20 ++++++++++---------- vars/tokay | 20 ++++++++++---------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/vars/caiman b/vars/caiman index 88449372..e00ce15b 100644 --- a/vars/caiman +++ b/vars/caiman @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.008" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r5" -readonly build_number="12366759" +readonly build_number="12485168" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap3a.241005.015-factory-78027787.zip" -readonly image_sha256="780277871f9baf483baf1e60e08dedd5d012c4db2164e8ada1c992ff1d872462" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap3a.241105.008-factory-0e1c388b.zip" +readonly image_sha256="0e1c388bf004a048b2ad488a22ac979660bdfc28c4d9eb05adaf3dc89bc3018d" -readonly flash_url="https://flash.android.com/build/12366759?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/12485168?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap3a.241005.015-c4aa7b6f.zip" -readonly ota_sha256="c4aa7b6f5547b3f40c0158203789ae913ed5c3fb619e6f8521526a36832b8aa6" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap3a.241105.008-220f2d94.zip" +readonly ota_sha256="220f2d94900ad387d4b318ac605b72aacdc2b7be11f02dd977378227d55d5297" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/comet b/vars/comet index c3dc4cde..c9706653 100644 --- a/vars/comet +++ b/vars/comet @@ -10,23 +10,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.008" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r5" -readonly build_number="12366759" +readonly build_number="12485168" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap3a.241005.015-factory-82265301.zip" -readonly image_sha256="822653013287492f11f9541c5f555f935f8163aa18d0967dcf17c805afcfd995" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap3a.241105.008-factory-342ea0db.zip" +readonly image_sha256="342ea0dbe713b5b6589a1be4fcd5bce95e244c1af9ad753b9142f8fc993582d8" -readonly flash_url="https://flash.android.com/build/12366759?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/12485168?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap3a.241005.015-5350adac.zip" -readonly ota_sha256="5350adacb10bd370b67f7120cff96975c18a14889b97a855cdd89cb53bff00bc" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap3a.241105.008-ebe2f388.zip" +readonly ota_sha256="ebe2f38837b4f8a32dc04f5d3ac53bc9b1ff722fa7cb000237204deadd70179a" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/common b/vars/common index 5a289078..f104f10e 100644 --- a/vars/common +++ b/vars/common @@ -7,10 +7,10 @@ readonly device_branch=staging/android15 readonly common_aosp_branch=android15-release # Nov 2024 -readonly prev_common_aosp_tag=android-15.0.0_r2 # Oct 2024, Pixel 6 - 9 -readonly common_aosp_tag=android-15.0.0_r4 # Nov 2024, Pixel 6 - 8a +readonly prev_common_aosp_tag=android-15.0.0_r4 # Nov 2024, Pixel 6 - 8a +readonly common_aosp_tag=android-15.0.0_r5 # Nov 2024, Pixel 9 -readonly common_aosp_build_id=AP3A.241105.007 # Nov 2024, Pixel 6 - 8a +readonly common_aosp_build_id=AP3A.241105.008 # Nov 2024, Pixel 9 readonly topic=nov24 diff --git a/vars/komodo b/vars/komodo index 55a6e6ac..69705d46 100644 --- a/vars/komodo +++ b/vars/komodo @@ -13,23 +13,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.008" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r5" -readonly build_number="12366759" +readonly build_number="12485168" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap3a.241005.015-factory-2ef380c8.zip" -readonly image_sha256="2ef380c8ded2820c017081427c4a9bec1324cf116e038cfa0d166aeb9df298ed" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap3a.241105.008-factory-56147c26.zip" +readonly image_sha256="56147c2639398c077ab201d7989a4c52e21bdcfe314a7c7200f7fc1550e7600f" -readonly flash_url="https://flash.android.com/build/12366759?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/12485168?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap3a.241005.015-56f40758.zip" -readonly ota_sha256="56f407586996c9e6aed6fe18df90febdb09dc56bbe496a9923da30d5034760b3" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap3a.241105.008-9be9eed2.zip" +readonly ota_sha256="9be9eed251c48ddef18cecb85f2aa5f2dd7d200d31d0fb3606c8c213e0838043" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" diff --git a/vars/tokay b/vars/tokay index 102e958d..d03152ee 100644 --- a/vars/tokay +++ b/vars/tokay @@ -9,23 +9,23 @@ readonly fbpk_version="v2" # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241005.015" +readonly build_id="AP3A.241105.008" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-release" -readonly prev_aosp_tag="android-14.0.0_r67" -readonly aosp_tag="android-15.0.0_r2" +readonly prev_aosp_tag="android-15.0.0_r2" +readonly aosp_tag="android-15.0.0_r5" -readonly build_number="12366759" +readonly build_number="12485168" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap3a.241005.015-factory-88013873.zip" -readonly image_sha256="880138730c75aca3dd388759fa1711cab650aad21047889d5adf6bfa514ac87a" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap3a.241105.008-factory-ac307537.zip" +readonly image_sha256="ac3075378d2b1e72b555dc44436cc6189b6ba3226a082f8c781dde5dbe39a0cd" -readonly flash_url="https://flash.android.com/build/12366759?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/12485168?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap3a.241005.015-8894bda5.zip" -readonly ota_sha256="8894bda50281db30834bff55813ff53bcc823b39f310ebafcdaaa423e5acb01a" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap3a.241105.008-1c012036.zip" +readonly ota_sha256="1c012036f1e00e9be9d46f80afa907d98bbe06665d377a4ee326e90ccde73419" -readonly security_patch="2024-10-05" +readonly security_patch="2024-11-05" From e970ffe1d6be61b5a3781e18e964615f28adb8b6 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 31 Jul 2024 18:20:34 -0400 Subject: [PATCH 065/111] vars: Re-order devices Issue: calyxos#2298 Change-Id: Ida29090906091a1ab4d651e8219a41f717a076cd --- vars/devices | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vars/devices b/vars/devices index 0ebe00de..54c19fe7 100644 --- a/vars/devices +++ b/vars/devices @@ -1,6 +1,11 @@ # All supported devices # Usage: ${devices[@]} readonly devices=( + FP5 + FP4 + devon + hawao + rhode comet komodo caiman @@ -26,10 +31,5 @@ readonly devices=( sargo crosshatch blueline - FP5 - FP4 axolotl - devon - hawao - rhode ) From 6d186c3e0043c737f8e71deee9a922b44aa455ee Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 16 Oct 2024 02:27:37 +0530 Subject: [PATCH 066/111] Drop Pixel 3, 3a, SHIFT6MQ * No longer supported * Won't get 15 anyways * RIP Change-Id: I55630ef59c4086715ec0c2df46a8075ef863f3ba --- vars/axolotl | 7 ------- vars/blueline | 29 ----------------------------- vars/bonito | 30 ------------------------------ vars/crosshatch | 30 ------------------------------ vars/device_kernels | 2 -- vars/devices | 5 ----- vars/lineage_devices | 1 - vars/msm-4.9 | 8 -------- vars/sargo | 29 ----------------------------- 9 files changed, 141 deletions(-) delete mode 100644 vars/axolotl delete mode 100644 vars/blueline delete mode 100644 vars/bonito delete mode 100644 vars/crosshatch delete mode 100644 vars/msm-4.9 delete mode 100644 vars/sargo diff --git a/vars/axolotl b/vars/axolotl deleted file mode 100644 index b98cb488..00000000 --- a/vars/axolotl +++ /dev/null @@ -1,7 +0,0 @@ -# SHIFT6mq - -# Usage: ${device_repos[@]} -device_repos=( - device/shift/axolotl - kernel/shift/sdm845 -) diff --git a/vars/blueline b/vars/blueline deleted file mode 100644 index a8136d33..00000000 --- a/vars/blueline +++ /dev/null @@ -1,29 +0,0 @@ -# Pixel 3 - -# Usage: ${device_repos[@]} -device_repos=( - # common repos in crosshatch -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id=SP1A.210812.016.C2 # Jun 2022 - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="android12-s5-release" - -readonly prev_aosp_tag="android-12.0.0_r31" -readonly aosp_tag="android-12.0.0_r34" - -readonly build_number="8618562" - -readonly image_url="https://dl.google.com/dl/android/aosp/blueline-sp1a.210812.016.c2-factory-fa981d87.zip" -readonly image_sha256="fa981d87b6b28a1996161accbb147f46fe29663bb2ce6cc13dc9e500cbc59c93" - -readonly flash_url="https://flash.android.com/build/8618562?target=blueline-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/blueline-ota-sp1a.210812.016.c2-f7ebc6b3.zip" -readonly ota_sha256="f7ebc6b326be1b40355d1e0b6d5e5e73204878f3419dec954eb35e1677bb12a1" - -readonly security_patch="2021-10-05" diff --git a/vars/bonito b/vars/bonito deleted file mode 100644 index b2d96200..00000000 --- a/vars/bonito +++ /dev/null @@ -1,30 +0,0 @@ -# Pixel 3a XL - -# Usage: ${device_repos[@]} -device_repos=( - device/google/bonito - device/google/bonito-sepolicy -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id="SP2A.220505.008" - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="android12L-release" - -readonly prev_aosp_tag="android-12.1.0_r6" -readonly aosp_tag="android-12.1.0_r27" - -readonly build_number="8782922" - -readonly image_url="https://dl.google.com/dl/android/aosp/bonito-sp2a.220505.008-factory-db19d2aa.zip" -readonly image_sha256="db19d2aaff36f29b7f58f11acad856f9382dafa1ae9160a692782e27cd7b0002" - -readonly flash_url="https://flash.android.com/build/8782922?target=bonito-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/bonito-ota-sp2a.220505.008-37a410d5.zip" -readonly ota_sha256="37a410d5a370771625e9c607913ab94b07e1bebdb1b0c1a931854d48b5defe53" - -readonly security_patch="2022-05-05" diff --git a/vars/crosshatch b/vars/crosshatch deleted file mode 100644 index b234bbfe..00000000 --- a/vars/crosshatch +++ /dev/null @@ -1,30 +0,0 @@ -# Pixel 3 XL - -# Usage: ${device_repos[@]} -device_repos=( - device/google/crosshatch - device/google/crosshatch-sepolicy -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id=SP1A.210812.016.C2 # Jun 2022 - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="android12-s5-release" - -readonly prev_aosp_tag="android-12.0.0_r31" -readonly aosp_tag="android-12.0.0_r34" - -readonly build_number="8618562" - -readonly image_url="https://dl.google.com/dl/android/aosp/crosshatch-sp1a.210812.016.c2-factory-27f59137.zip" -readonly image_sha256="27f59137f9802f6913f92d820bb0cbd80793f6e4a80c5f05e1242810903d4aea" - -readonly flash_url="https://flash.android.com/build/8618562?target=crosshatch-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/crosshatch-ota-sp1a.210812.016.c2-efea980d.zip" -readonly ota_sha256="efea980d6359363b645435a5d077228d9a00d6f9772bf6adf16e26090dba0d53" - -readonly security_patch="2021-10-05" diff --git a/vars/device_kernels b/vars/device_kernels index f693ef12..3ff5eb44 100644 --- a/vars/device_kernels +++ b/vars/device_kernels @@ -9,6 +9,4 @@ readonly device_kernels=( redbull sunfish coral - bonito - crosshatch ) diff --git a/vars/devices b/vars/devices index 54c19fe7..a2f889b2 100644 --- a/vars/devices +++ b/vars/devices @@ -27,9 +27,4 @@ readonly devices=( sunfish coral flame - bonito - sargo - crosshatch - blueline - axolotl ) diff --git a/vars/lineage_devices b/vars/lineage_devices index f3b1b941..d17e40d8 100644 --- a/vars/lineage_devices +++ b/vars/lineage_devices @@ -3,7 +3,6 @@ readonly lineage_devices=( FP5 FP4 - axolotl devon hawao rhode diff --git a/vars/msm-4.9 b/vars/msm-4.9 deleted file mode 100644 index e2155f78..00000000 --- a/vars/msm-4.9 +++ /dev/null @@ -1,8 +0,0 @@ -# Pixel 3, 3a - -# Updated semi-manually via pixel/update-any-var.sh - -readonly kernel_branch="android-msm-bonito-4.9-android12L" # May 2022 - -readonly prev_kernel_tag=android-12.1.0_r0.17 # May 2022 -readonly kernel_tag=android-12.1.0_r0.23 # May 2022 diff --git a/vars/sargo b/vars/sargo deleted file mode 100644 index 8eab163f..00000000 --- a/vars/sargo +++ /dev/null @@ -1,29 +0,0 @@ -# Pixel 3a - -# Usage: ${device_repos[@]} -device_repos=( - # common repos in bonito -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id="SP2A.220505.008" - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="android12L-release" - -readonly prev_aosp_tag="android-12.1.0_r6" -readonly aosp_tag="android-12.1.0_r27" - -readonly build_number="8782922" - -readonly image_url="https://dl.google.com/dl/android/aosp/sargo-sp2a.220505.008-factory-071e368a.zip" -readonly image_sha256="071e368a127ce5a3c553f8b717895eaf1e44dec78971dc4c80baa7237d2d37f1" - -readonly flash_url="https://flash.android.com/build/8782922?target=sargo-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/sargo-ota-sp2a.220505.008-2037245c.zip" -readonly ota_sha256="2037245c06c8e0912c098c347be7b49a707d7cacf9a663ad7e68c96ce75ea32b" - -readonly security_patch="2022-05-05" From e64e2d893ff7769ae92c1b775db69c8df47095d4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 16 Oct 2024 02:28:01 +0530 Subject: [PATCH 067/111] device_kernels: Drop no-longer built kernels * New setup may look different Change-Id: I3a684c7ee47892a810dd48cd39a715f2402b0338 --- vars/device_kernels | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vars/device_kernels b/vars/device_kernels index 3ff5eb44..906f5210 100644 --- a/vars/device_kernels +++ b/vars/device_kernels @@ -1,11 +1,5 @@ # Usage: ${device_kernels[@]} readonly device_kernels=( - felix - tangorpro - lynx - pantah - bluejay - raviole redbull sunfish coral From 7db5dfb31f4e3e57427543e35c80c18d187e605d Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Fri, 27 Sep 2024 13:11:17 +0300 Subject: [PATCH 068/111] pixel: extract-utils: implement V1 image unpacking in fbpack Also, while at it, detect radio image automatically. Change-Id: I28bf371567e208a6bb2113623270cfddefa69f80 --- fbpacktool/fbpack.py | 68 +++++++++++++++++++++++++++++++++++++++ fbpacktool/fbpacktool.py | 37 +++++++++++++++------ pixel/prepare-firmware.sh | 18 +++-------- 3 files changed, 100 insertions(+), 23 deletions(-) diff --git a/fbpacktool/fbpack.py b/fbpacktool/fbpack.py index 5fc7cc99..3afccd69 100644 --- a/fbpacktool/fbpack.py +++ b/fbpacktool/fbpack.py @@ -19,6 +19,7 @@ FBPACK_MAGIC = 0x4b504246 # "FBPK" FastBook PacK FBPACK_VERSION = 2 +FBPACK_VERSION_V1 = 1 FBPACK_DEFAULT_DATA_ALIGN = 16 FBPACK_PARTITION_TABLE = 0 @@ -26,6 +27,20 @@ FBPACK_SIDELOAD_DATA = 2 +class CommonPackHeader(packedstruct.PackedStruct): + magic: int + version: int + _FIELDS = collections.OrderedDict([ + ('magic', 'I'), + ('version', 'I'), + ]) + + def __init__(self, + magic=FBPACK_MAGIC, + version=FBPACK_VERSION_V1): + super().__init__(magic, version) + + class PackEntry(packedstruct.PackedStruct): """Pack entry info.""" @@ -103,3 +118,56 @@ def __init__(self, total_entries, total_size) # update header size once we know all fields self.header_size = len(self) + + +class PackHeaderV1(packedstruct.PackedStruct): + magic: int + version: int + img_version: str + total_entries: int + total_size: int + _FIELDS = collections.OrderedDict([ + ('magic', 'I'), + ('version', 'I'), + ('img_version', '68s'), + ('total_entries', 'I'), + ('total_size', 'I'), + ]) + + def __init__(self, + magic=FBPACK_MAGIC, + version=FBPACK_VERSION_V1, + img_version=b'', + total_entries=0, + total_size=0): + super().__init__(magic, version, img_version, total_entries, total_size) + +class PackEntryV1(packedstruct.PackedStruct): + type: int + name: str + size_h: int + size: int + next_offset_h: int + next_offset: int + crc32: int + _FIELDS = collections.OrderedDict([ + ('type', 'I'), + ('name', '32s'), + ('size_h', 'I'), + ('size', 'I'), + ('next_offset_h', 'I'), + ('next_offset', 'I'), + ('crc32', 'I'), + ]) + + # Provide defaults. + # pylint: disable=useless-super-delegation + def __init__(self, + type_=0, + name=b'', + size_h=0, + size=0, + next_offset_h=0, + next_offset=0, + crc32=0): + super().__init__(type_, name, size_h, size, next_offset_h, next_offset, crc32) diff --git a/fbpacktool/fbpacktool.py b/fbpacktool/fbpacktool.py index 943b3bba..7a04b0a9 100644 --- a/fbpacktool/fbpacktool.py +++ b/fbpacktool/fbpacktool.py @@ -146,21 +146,41 @@ def copyfileobj(src, dst, file_size): def cmd_unpack(args): with open(args.file, 'rb') as f: - pack = fbpack.PackHeader.from_bytes(f.read(len(fbpack.PackHeader()))) + pack = fbpack.CommonPackHeader.from_bytes(f.read(len(fbpack.CommonPackHeader()))) - if pack.version != fbpack.FBPACK_VERSION: + f.seek(0, os.SEEK_SET) + + if pack.version == fbpack.FBPACK_VERSION: + pack = fbpack.PackHeader.from_bytes(f.read(len(fbpack.PackHeader()))) + elif pack.version == fbpack.FBPACK_VERSION_V1: + pack = fbpack.PackHeaderV1.from_bytes(f.read(len(fbpack.PackHeaderV1()))) + else: raise NotImplementedError('unsupported version {}'.format(pack.version)) entries = [] + next_offset = len(pack) # create list of entries we want to extact for _ in range(pack.total_entries): - entry = fbpack.PackEntry.from_bytes(f.read(len(fbpack.PackEntry()))) + if pack.version == fbpack.FBPACK_VERSION: + entry = fbpack.PackEntry.from_bytes(f.read(len(fbpack.PackEntry()))) + offset = entry.offset + else: + f.seek(next_offset, os.SEEK_SET) + entry = fbpack.PackEntryV1.from_bytes(f.read(len(fbpack.PackEntryV1()))) + offset = f.tell() + next_offset = (entry.next_offset_h << 32) | entry.next_offset + + if entry.type == 0: + # Ignore partition table entries, next_offset will tell us + # where to go next + continue + name = bytes_to_str(entry.name) if not args.partitions or name in args.partitions: # if both product are valid then match product name too if not args.product or not entry.product or product_match( entry.product, args.product): - entries.append(entry) + entries.append((name, offset, entry.size)) if not entries and not args.unpack_ver: raise RuntimeError('no images to unpack') @@ -171,11 +191,10 @@ def cmd_unpack(args): out_files = {} # write file per entry - for entry in entries: - name = bytes_to_str(entry.name) + for name, offset, size in entries: logging.info('Unpacking {} (size: {}, offset: {})'.format( - name, entry.size, entry.offset)) - f.seek(entry.offset) + name, size, offset)) + f.seek(offset) entry_filename = os.path.join(args.out_dir, name + '.img') instance = out_files.get(entry_filename, 0) + 1 out_files[entry_filename] = instance @@ -183,7 +202,7 @@ def cmd_unpack(args): entry_filename = os.path.join(args.out_dir, name + '({}).img'.format(instance - 1)) with open(entry_filename, 'wb') as entry_file: - copyfileobj(f, entry_file, entry.size) + copyfileobj(f, entry_file, size) if args.unpack_ver: ver_file_path = os.path.join(args.out_dir, 'version.txt') diff --git a/pixel/prepare-firmware.sh b/pixel/prepare-firmware.sh index 452b72c4..70d0bdd6 100755 --- a/pixel/prepare-firmware.sh +++ b/pixel/prepare-firmware.sh @@ -27,17 +27,11 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" readonly top="${script_path}/../../.." readonly fbpacktool="${top}/calyx/scripts/fbpacktool/fbpacktool.py" -readonly qc_image_unpacker="${top}/prebuilts/extract-tools/linux-x86/bin/qc_image_unpacker" readonly device="${1}" -source "${vars_path}/${device}" - -readonly _fbpk_version="${fbpk_version:-v1}" -readonly _wifi_only="${wifi_only:-false}" readonly vendor_path="${top}/vendor/google/${device}" @@ -61,16 +55,12 @@ copy_factory_firmware() { # Unpack the seperate partitions needed for OTA # from the factory image's bootloader.img & radio.img unpack_firmware() { - if [[ "${_wifi_only}" != "true" ]]; then - "${qc_image_unpacker}" -i "${src_dir}"/radio-*.img -o "${src_dir}" - # Alternative: dd bs=4 skip=35 + radio_img=$(compgen -G "${src_dir}/radio-*.img") + if [ -n "${radio_img}" ]; then + python3 "${fbpacktool}" unpack -o "${src_dir}" "${radio_img}" fi - if [[ "$_fbpk_version" == "v1" ]]; then - "${qc_image_unpacker}" -i "${src_dir}"/bootloader-*.img -o "${src_dir}" - else - python3 "${fbpacktool}" unpack -o "${src_dir}" "${src_dir}"/bootloader-*.img - fi + python3 "${fbpacktool}" unpack -o "${src_dir}" "${src_dir}"/bootloader-*.img } # error message From 45db46333f851215021245202cb0e725e1d5db36 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Fri, 27 Sep 2024 13:20:46 +0300 Subject: [PATCH 069/111] vars: remove fbpk_version and wifi_only Both V1 and V2 FBPK versions are handled by the same script now, and radio image existance it detected automatically. Change-Id: If9b1bced702cf66a4ceaaadf13801039c3ae661d --- vars/akita | 2 -- vars/bluejay | 2 -- vars/caiman | 2 -- vars/cheetah | 2 -- vars/comet | 2 -- vars/felix | 2 -- vars/husky | 2 -- vars/komodo | 2 -- vars/lynx | 2 -- vars/oriole | 2 -- vars/panther | 2 -- vars/raven | 2 -- vars/shiba | 2 -- vars/tangorpro | 3 --- vars/tokay | 2 -- 15 files changed, 31 deletions(-) diff --git a/vars/akita b/vars/akita index 1e31d778..dec9d97b 100644 --- a/vars/akita +++ b/vars/akita @@ -6,8 +6,6 @@ device_repos=( device/google/akita-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/bluejay b/vars/bluejay index e6d51169..e915f209 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -6,8 +6,6 @@ device_repos=( device/google/bluejay-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/caiman b/vars/caiman index e00ce15b..a78ad573 100644 --- a/vars/caiman +++ b/vars/caiman @@ -5,8 +5,6 @@ device_repos=( # common repos in komodo ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.008" diff --git a/vars/cheetah b/vars/cheetah index 261cea0c..e6f3acfe 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -7,8 +7,6 @@ device_repos=( device/google/pantah ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/comet b/vars/comet index c9706653..90d4d2bb 100644 --- a/vars/comet +++ b/vars/comet @@ -6,8 +6,6 @@ device_repos=( device/google/comet-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.008" diff --git a/vars/felix b/vars/felix index 2267859d..cbff388f 100644 --- a/vars/felix +++ b/vars/felix @@ -6,8 +6,6 @@ device_repos=( device/google/felix-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/husky b/vars/husky index ecb4b79d..93c8a2b9 100644 --- a/vars/husky +++ b/vars/husky @@ -8,8 +8,6 @@ device_repos=( device/google/shusky-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/komodo b/vars/komodo index 69705d46..58781ce8 100644 --- a/vars/komodo +++ b/vars/komodo @@ -9,8 +9,6 @@ device_repos=( device/google/caimito-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.008" diff --git a/vars/lynx b/vars/lynx index 8bf51c8e..b785e7a3 100644 --- a/vars/lynx +++ b/vars/lynx @@ -6,8 +6,6 @@ device_repos=( device/google/lynx-sepolicy ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/oriole b/vars/oriole index a00ea209..89adf1de 100644 --- a/vars/oriole +++ b/vars/oriole @@ -5,8 +5,6 @@ device_repos=( # common repos in raven ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/panther b/vars/panther index e3d2f3c7..ebfb8dd1 100644 --- a/vars/panther +++ b/vars/panther @@ -5,8 +5,6 @@ device_repos=( # common repos in cheetah ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/raven b/vars/raven index 00e73ccc..63d4f333 100644 --- a/vars/raven +++ b/vars/raven @@ -7,8 +7,6 @@ device_repos=( device/google/raviole ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/shiba b/vars/shiba index 229319bd..622f7563 100644 --- a/vars/shiba +++ b/vars/shiba @@ -5,8 +5,6 @@ device_repos=( # common repos in husky ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/tangorpro b/vars/tangorpro index 87267c9e..84a3036c 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -6,9 +6,6 @@ device_repos=( device/google/tangorpro-sepolicy ) -readonly fbpk_version="v2" -readonly wifi_only=true - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.007" diff --git a/vars/tokay b/vars/tokay index d03152ee..e1d42dfc 100644 --- a/vars/tokay +++ b/vars/tokay @@ -5,8 +5,6 @@ device_repos=( # common repos in komodo ) -readonly fbpk_version="v2" - # Updated semi-manually via pixel/update-any-var.sh readonly build_id="AP3A.241105.008" From d9ed9e8455f962fffc30d16a5a6a3ade94fe3124 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 3 Nov 2024 22:13:21 +0200 Subject: [PATCH 070/111] pixel: Changes for python extract-utils Change-Id: Iae28457893be7a2efe28b48fc31bc8221bca4771 --- pixel/device.sh | 14 ++++- pixel/extract-factory-image.sh | 83 ------------------------- pixel/prepare-firmware-makefiles.sh | 93 ----------------------------- pixel/prepare-firmware.sh | 92 ---------------------------- 4 files changed, 11 insertions(+), 271 deletions(-) delete mode 100755 pixel/extract-factory-image.sh delete mode 100755 pixel/prepare-firmware-makefiles.sh delete mode 100755 pixel/prepare-firmware.sh diff --git a/pixel/device.sh b/pixel/device.sh index 223b2267..25c0c362 100755 --- a/pixel/device.sh +++ b/pixel/device.sh @@ -33,6 +33,8 @@ readonly work_dir="${WORK_DIR:-/tmp/pixel}" source "${vars_path}/pixels" +KEEP_DUMP=${KEEP_DUMP:-false} + ## HELP MESSAGE (USAGE INFO) # TODO @@ -41,13 +43,19 @@ source "${vars_path}/pixels" device() { local device="${1}" source "${vars_path}/${device}" - local factory_dir="${work_dir}/${device}/${build_id}/factory/${device}-${build_id,,}" + local factory_zip="${work_dir}/${device}/${build_id}/$(basename ${image_url})" + local extract_args="${factory_zip}" "${script_path}/download.sh" "${device}" - "${script_path}/extract-factory-image.sh" "${device}" + + if [ "$KEEP_DUMP" == "true" ] || [ "$KEEP_DUMP" == "1" ]; then + extract_args+=" --keep-dump" + fi + + extract_args+=" --extract-factory --regenerate" pushd "${top}" - device/google/${device}/extract-files.sh "${factory_dir}" + device/google/${device}/extract-files.py "${extract_args}" popd echo "${build_id}" > "${top}/vendor/google/${device}/build_id.txt" diff --git a/pixel/extract-factory-image.sh b/pixel/extract-factory-image.sh deleted file mode 100755 index c1b22d7c..00000000 --- a/pixel/extract-factory-image.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute -# -# SPDX-License-Identifier: Apache-2.0 - -# -# extract-factory-image: -# -# Extract Pixel factory images -# -# -############################################################################## - - -### SET ### - -# use bash strict mode -set -euo pipefail - - -### TRAPS ### - -# trap signals for clean exit -trap 'exit $?' EXIT -trap 'error_m interrupted!' SIGINT - -### CONSTANTS ### -readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" - -readonly work_dir="${WORK_DIR:-/tmp/pixel}" - -source "${vars_path}/pixels" - -readonly device="${1}" -source "${vars_path}/${device}" - -## HELP MESSAGE (USAGE INFO) -# TODO - -### FUNCTIONS ### - -extract_factory_image() { - local factory_dir="${work_dir}/${device}/${build_id}/factory" - if [[ -d "${factory_dir}" ]]; then - echo "Skipping factory image extraction, ${factory_dir} already exists" - exit - fi - mkdir -p "${factory_dir}" - local factory_zip="${work_dir}/${device}/${build_id}/$(basename ${image_url})" - echo "${image_sha256} ${factory_zip}" | sha256sum --check --status - pushd "${factory_dir}" - unzip -o "${factory_zip}" - pushd ${device}-${build_id,,} - unzip -o "image-${device}-${build_id,,}.zip" - popd - popd -} - -# error message -# ARG1: error message for STDERR -# ARG2: error status -error_m() { - echo "ERROR: ${1:-'failed.'}" 1>&2 - return "${2:-1}" -} - -# print help message. -help_message() { - echo "${help_message:-'No help available.'}" -} - -main() { - extract_factory_image -} - -### RUN PROGRAM ### - -main "${@}" - - -## diff --git a/pixel/prepare-firmware-makefiles.sh b/pixel/prepare-firmware-makefiles.sh deleted file mode 100755 index abaf36a5..00000000 --- a/pixel/prepare-firmware-makefiles.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute -# -# SPDX-License-Identifier: Apache-2.0 - -# -# prepare-firmware-makefiles: -# -# Setup pixel makefiles for images used in factory images -# -# -############################################################################## - - -### SET ### - -# use bash strict mode -set -euo pipefail - - -### TRAPS ### - -# trap signals for clean exit -trap 'exit $?' EXIT -trap 'error_m interrupted!' SIGINT - -### CONSTANTS ### -readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" -readonly top="${script_path}/../../.." - -readonly work_dir="${WORK_DIR:-/tmp/pixel}" - -source "${vars_path}/pixels" - -readonly device="${1}" -source "${vars_path}/${device}" - -readonly _wifi_only="${wifi_only:-false}" - -readonly vendor_path="${top}/vendor/google/${device}" - -## HELP MESSAGE (USAGE INFO) -# TODO - -### FUNCTIONS ### - -setup_makefiles() { - local androidmk="${2}" - local boardmk="${3}" - - printf '\n%s\n' "TARGET_BOARD_INFO_FILE := vendor/google/${device}/android-info.txt" >> "${boardmk}" - - local bootloader_version=$(cat "${vendor_path}/android-info.txt" | grep version-bootloader | cut -d = -f 2) - if [[ "${_wifi_only}" != "true" ]]; then - local radio_version=$(cat "${vendor_path}/android-info.txt" | grep version-baseband | cut -d = -f 2) - fi - - printf '\n%s\n' "\$(call add-radio-file,factory/bootloader-${device}-${bootloader_version,,}.img,version-bootloader)" >> "${androidmk}" - if [[ "${_wifi_only}" != "true" ]]; then - printf '%s\n' "\$(call add-radio-file,factory/radio-${device}-${radio_version,,}.img,version-baseband)" >> "${androidmk}" - fi - printf '\n' >> "${androidmk}" -} - -# error message -# ARG1: error message for STDERR -# ARG2: error status -error_m() { - echo "ERROR: ${1:-'failed.'}" 1>&2 - return "${2:-1}" -} - -# print help message. -help_message() { - echo "${help_message:-'No help available.'}" -} - -main() { - if [[ $# -eq 3 ]] ; then - setup_makefiles "${device}" "${2}" "${3}" - else - error_m - fi -} - -### RUN PROGRAM ### - -main "${@}" - - -## diff --git a/pixel/prepare-firmware.sh b/pixel/prepare-firmware.sh deleted file mode 100755 index 70d0bdd6..00000000 --- a/pixel/prepare-firmware.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022-2023 The Calyx Institute -# -# SPDX-License-Identifier: Apache-2.0 - -# -# prepare-firmware: -# -# Pixel firmware preparation hook for extract-utils -# -# -############################################################################## - - -### SET ### - -# use bash strict mode -set -euo pipefail - - -### TRAPS ### - -# trap signals for clean exit -trap 'exit $?' EXIT -trap 'error_m interrupted!' SIGINT - -### CONSTANTS ### -readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly top="${script_path}/../../.." - -readonly fbpacktool="${top}/calyx/scripts/fbpacktool/fbpacktool.py" - -readonly device="${1}" - -readonly vendor_path="${top}/vendor/google/${device}" - -readonly src_dir="${2}" - -## HELP MESSAGE (USAGE INFO) -# TODO - -### FUNCTIONS ### - -# Firmware included in our factory images, -# typically bootloader and radio -copy_factory_firmware() { - cp "${src_dir}"/bootloader-*.img "${vendor_path}/factory/" - if [[ "${_wifi_only}" != "true" ]]; then - cp "${src_dir}"/radio-*.img "${vendor_path}/factory/" - fi - cp "${src_dir}"/android-info.txt "${vendor_path}/android-info.txt" -} - -# Unpack the seperate partitions needed for OTA -# from the factory image's bootloader.img & radio.img -unpack_firmware() { - radio_img=$(compgen -G "${src_dir}/radio-*.img") - if [ -n "${radio_img}" ]; then - python3 "${fbpacktool}" unpack -o "${src_dir}" "${radio_img}" - fi - - python3 "${fbpacktool}" unpack -o "${src_dir}" "${src_dir}"/bootloader-*.img -} - -# error message -# ARG1: error message for STDERR -# ARG2: error status -error_m() { - echo "ERROR: ${1:-'failed.'}" 1>&2 - return "${2:-1}" -} - -# print help message. -help_message() { - echo "${help_message:-'No help available.'}" -} - -main() { - rm -rf "${vendor_path}/factory" - mkdir -p "${vendor_path}/factory" - - copy_factory_firmware - unpack_firmware -} - -### RUN PROGRAM ### - -main "${@}" - - -## From e5528d2e6a9d23c43f5617e41f483ab65ab05485 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 5 Dec 2024 20:04:05 +0530 Subject: [PATCH 071/111] December 2024 Security update, partial Change-Id: Ica6037c1b3d40df5c3b8baa6df9a166b27de04db --- vars/common | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/common b/vars/common index f104f10e..bfac250e 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=staging/android15 readonly device_branch=staging/android15 -readonly common_aosp_branch=android15-release # Nov 2024 +readonly common_aosp_branch=android15-security-release # Dec 2024 -readonly prev_common_aosp_tag=android-15.0.0_r4 # Nov 2024, Pixel 6 - 8a -readonly common_aosp_tag=android-15.0.0_r5 # Nov 2024, Pixel 9 +readonly prev_common_aosp_tag=android-15.0.0_r5 # Nov 2024, Pixel 9 +readonly common_aosp_tag=android-security-15.0.0_r3 # Dec 2024 readonly common_aosp_build_id=AP3A.241105.008 # Nov 2024, Pixel 9 -readonly topic=nov24 +readonly topic=dec24 readonly lineageos_branch=lineage-22.0 readonly lineageos_device_branch=lineage-22.0 From fdcb61548f51466eb95ec841643698250392beca Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 5 Dec 2024 21:27:59 +0200 Subject: [PATCH 072/111] December 2024 Quarterly Platform Release and Security update Change-Id: I4f61f70a7239bcfdf49fff817449cca90d159317 --- vars/akita | 22 +++++++++++----------- vars/aosp_target_release | 2 +- vars/bluejay | 22 +++++++++++----------- vars/caiman | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/comet | 22 +++++++++++----------- vars/common | 6 +++--- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/komodo | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- vars/tokay | 22 +++++++++++----------- 17 files changed, 169 insertions(+), 169 deletions(-) diff --git a/vars/akita b/vars/akita index dec9d97b..00f55062 100644 --- a/vars/akita +++ b/vars/akita @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap3a.241105.007-factory-680e6948.zip" -readonly image_sha256="680e69480d997c375eb5f6b6ab4685e1cab86a7fa88f1f4d0272291c171cdeab" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap4a.241205.013-factory-e77805c2.zip" +readonly image_sha256="e77805c249a00670a1ce972f06b613aa166c2955e7908548f4f2292b0e1db8ec" -readonly flash_url="https://flash.android.com/build/12470370?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap3a.241105.007-38cfd2b5.zip" -readonly ota_sha256="38cfd2b5c0ac39682c38fab939413790f05364a1ab46cb58b1d3b41fa20f1564" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap4a.241205.013-de582711.zip" +readonly ota_sha256="de582711cb4b8935833b9fb5bf1b9024389051d9bb560dd88ad85c2a747fa8d0" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/aosp_target_release b/vars/aosp_target_release index f1e04989..53601ef3 100644 --- a/vars/aosp_target_release +++ b/vars/aosp_target_release @@ -1,2 +1,2 @@ # Updated manually -aosp_target_release=ap3a +aosp_target_release=ap4a diff --git a/vars/bluejay b/vars/bluejay index e915f209..57c67346 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap3a.241105.007-factory-c657cf23.zip" -readonly image_sha256="c657cf23a3bca74d77260ca509ece8a513bc8ef80264bb591a242721ffa061de" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap4a.241205.013-factory-f6c5ddf3.zip" +readonly image_sha256="f6c5ddf3646f002d62fc49c58fc9a7199e1e66cb143bef1a38e9b654bbaba858" -readonly flash_url="https://flash.android.com/build/12470370?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap3a.241105.007-365e6b12.zip" -readonly ota_sha256="365e6b1225cd936116e9b0cff13ba17fda8e31697dd1ce74c53b872b7f004994" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap4a.241205.013-10a378a5.zip" +readonly ota_sha256="10a378a57c3389678bd753cd2216af413af057d56deac376b2b36a7525bcea52" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/caiman b/vars/caiman index a78ad573..e41a6b11 100644 --- a/vars/caiman +++ b/vars/caiman @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.008" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r5" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12485168" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap3a.241105.008-factory-0e1c388b.zip" -readonly image_sha256="0e1c388bf004a048b2ad488a22ac979660bdfc28c4d9eb05adaf3dc89bc3018d" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap4a.241205.013-factory-d7703f4c.zip" +readonly image_sha256="d7703f4cd55e0214d03d35a31cba4c7da1e05966fd68b356653de68ee70c8f9f" -readonly flash_url="https://flash.android.com/build/12485168?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap3a.241105.008-220f2d94.zip" -readonly ota_sha256="220f2d94900ad387d4b318ac605b72aacdc2b7be11f02dd977378227d55d5297" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap4a.241205.013-b914a097.zip" +readonly ota_sha256="b914a097abef5ecc62792fe9cf103b84c676ba64736e7cdc3802102901c87116" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/cheetah b/vars/cheetah index e6f3acfe..1137a5c4 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap3a.241105.007-factory-6e4aec19.zip" -readonly image_sha256="6e4aec19c8d1dc01ea217e37f7c9f7c2e78701927acd3106919e41cdc0223798" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap4a.241205.013-factory-93675b9d.zip" +readonly image_sha256="93675b9dfef9aa9b30b1aa29b342e103ead2c3dcfd5c449af4bab4b0626f13ed" -readonly flash_url="https://flash.android.com/build/12470370?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap3a.241105.007-6417e400.zip" -readonly ota_sha256="6417e4005b669415c4b9d0bec6d539723833eca830369f23476d1aee664d3624" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap4a.241205.013-295dbbca.zip" +readonly ota_sha256="295dbbcad1f40ffc69d788fd34b8bae610d764300d83b9e44f1ba44dbabff5b2" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/comet b/vars/comet index 90d4d2bb..aebe21a6 100644 --- a/vars/comet +++ b/vars/comet @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.008" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r5" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12485168" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap3a.241105.008-factory-342ea0db.zip" -readonly image_sha256="342ea0dbe713b5b6589a1be4fcd5bce95e244c1af9ad753b9142f8fc993582d8" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap4a.241205.013-factory-c38dc0ba.zip" +readonly image_sha256="c38dc0bacde39ac8c4be0b709fcf1f816baf0df16f2742f6e7f99cb38c2a5bd9" -readonly flash_url="https://flash.android.com/build/12485168?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap3a.241105.008-ebe2f388.zip" -readonly ota_sha256="ebe2f38837b4f8a32dc04f5d3ac53bc9b1ff722fa7cb000237204deadd70179a" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap4a.241205.013-616bfa66.zip" +readonly ota_sha256="616bfa66d15b5dfd5c76e00d2a8c78a09ffef320eff56d31bcca51d4e8a003b0" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/common b/vars/common index bfac250e..bbcdccd1 100644 --- a/vars/common +++ b/vars/common @@ -5,12 +5,12 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=staging/android15 readonly device_branch=staging/android15 -readonly common_aosp_branch=android15-security-release # Dec 2024 +readonly common_aosp_branch=android15-qpr1-release # Dec 2024 readonly prev_common_aosp_tag=android-15.0.0_r5 # Nov 2024, Pixel 9 -readonly common_aosp_tag=android-security-15.0.0_r3 # Dec 2024 +readonly common_aosp_tag=android-15.0.0_r6 # Dec 2024, Pixel 6-9 -readonly common_aosp_build_id=AP3A.241105.008 # Nov 2024, Pixel 9 +readonly common_aosp_build_id=AP4A.241205.013 # Dec 2024, Pixel 6-9 readonly topic=dec24 diff --git a/vars/felix b/vars/felix index cbff388f..47a42dec 100644 --- a/vars/felix +++ b/vars/felix @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap3a.241105.007-factory-86022efb.zip" -readonly image_sha256="86022efbe2786d3f8c941edb6895539b6d6a08b08aedaef14c57f96b5b7c9bf7" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap4a.241205.013-factory-7d1b8f98.zip" +readonly image_sha256="7d1b8f989fee12b493b45b56de99dc5de5c153d3787def11d7c4be2ffb54f725" -readonly flash_url="https://flash.android.com/build/12470370?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap3a.241105.007-c9ba0974.zip" -readonly ota_sha256="c9ba0974d6614ee01e48205520f9483908e96c70497d280320c58aa893532fe4" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap4a.241205.013-a7b7c57f.zip" +readonly ota_sha256="a7b7c57f2e6b5c3384787026781bba7623dec219ecad4eac90d782cc31dec1c9" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/husky b/vars/husky index 93c8a2b9..f8fb16c7 100644 --- a/vars/husky +++ b/vars/husky @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap3a.241105.007-factory-fb1a94a5.zip" -readonly image_sha256="fb1a94a59cc17170296e38c43ee73e83609e0016b11bcb3dca48b8c3db2f4d3b" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap4a.241205.013-factory-f5de0825.zip" +readonly image_sha256="f5de0825365a63eaa17dc5bf8325cda66dd808ed817e72f2267c7106a8232a8a" -readonly flash_url="https://flash.android.com/build/12470370?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap3a.241105.007-65d7be98.zip" -readonly ota_sha256="65d7be989eb8c10182c2d86c371303e1487263f87259e5e1d1d0de15e64fa445" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap4a.241205.013-ae93708d.zip" +readonly ota_sha256="ae93708d6df45aac766c34ec4e1e1466c9203d023db0ed16a8dc582891584044" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/komodo b/vars/komodo index 58781ce8..8ea87710 100644 --- a/vars/komodo +++ b/vars/komodo @@ -11,23 +11,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.008" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r5" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12485168" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap3a.241105.008-factory-56147c26.zip" -readonly image_sha256="56147c2639398c077ab201d7989a4c52e21bdcfe314a7c7200f7fc1550e7600f" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap4a.241205.013-factory-7675209b.zip" +readonly image_sha256="7675209b3e5b8902e9942b2721d3bea0a8219ceacf1dcc20d05f48036b7a7e35" -readonly flash_url="https://flash.android.com/build/12485168?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap3a.241105.008-9be9eed2.zip" -readonly ota_sha256="9be9eed251c48ddef18cecb85f2aa5f2dd7d200d31d0fb3606c8c213e0838043" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap4a.241205.013-9addf596.zip" +readonly ota_sha256="9addf5963f9732b019d29d03d794976903518577a9b89c7fc27a5dd390c88b38" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/lynx b/vars/lynx index b785e7a3..35a6ddd6 100644 --- a/vars/lynx +++ b/vars/lynx @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap3a.241105.007-factory-52b18be6.zip" -readonly image_sha256="52b18be632607a89ccbf667e094cc73e7af59a2edd38a75493594d2990518a8f" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap4a.241205.013-factory-2cfa9b95.zip" +readonly image_sha256="2cfa9b95c0b91bc071205abbc0bc86690cb72b01c2b8c9bf152db6922cafb6e6" -readonly flash_url="https://flash.android.com/build/12470370?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap3a.241105.007-26c0a712.zip" -readonly ota_sha256="26c0a712700daff8c732d613cd82630255c4866300c45374a7fe4213d0f4d01b" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap4a.241205.013-c8013227.zip" +readonly ota_sha256="c8013227e36b3186a53f8a47e85bbba4651744f0195831313c37f6cd59beaddc" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/oriole b/vars/oriole index 89adf1de..481a6db0 100644 --- a/vars/oriole +++ b/vars/oriole @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap3a.241105.007-factory-ca5e993a.zip" -readonly image_sha256="ca5e993a45a879339bf5af759b7ca9034b560bd7cec0cf24cd6382062bda6814" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap4a.241205.013-factory-93c45019.zip" +readonly image_sha256="93c450196960e4f0b80ee9efe3f2c7f2d6f318eb9d6ae38d9cb0e4bb6969fec4" -readonly flash_url="https://flash.android.com/build/12470370?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap3a.241105.007-e497d8e1.zip" -readonly ota_sha256="e497d8e1daf704553e34cb375b9c8d013f6821ec71ba4f6bba497ca51a6d9078" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap4a.241205.013-e30e32ff.zip" +readonly ota_sha256="e30e32ff6e7d21e7f647e904a73e4564e4c216f3fdeee2e7ab2528b63a1901f5" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/panther b/vars/panther index ebfb8dd1..f5e18e80 100644 --- a/vars/panther +++ b/vars/panther @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap3a.241105.007-factory-05e7464e.zip" -readonly image_sha256="05e7464e01e762ed689089a0284ef8e738301b0fb1feb1c1029d202eb1d8bd6e" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap4a.241205.013-factory-3fe89b24.zip" +readonly image_sha256="3fe89b24096c31aa2040471f9929e03f38c07365f0f577624576007e4388231d" -readonly flash_url="https://flash.android.com/build/12470370?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap3a.241105.007-fe11110e.zip" -readonly ota_sha256="fe11110ee40b0d440603ecb1a426155239fa542eb7b460000275e02205b58f2b" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap4a.241205.013-f3cd158f.zip" +readonly ota_sha256="f3cd158f8de85875d4110a0a75ad05d35e2883f4401e034a7b5efe280ff4c7b1" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/raven b/vars/raven index 63d4f333..b2e0a49b 100644 --- a/vars/raven +++ b/vars/raven @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap3a.241105.007-factory-647ea40c.zip" -readonly image_sha256="647ea40c9cf31dac376f766c0537f865cce4d02a5d0cee157fc6efaedd7f5699" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap4a.241205.013-factory-c80f7d84.zip" +readonly image_sha256="c80f7d847f1bd90ec9b4fbd575ece39e3f3987c04cc9a70ffd5895047933f66e" -readonly flash_url="https://flash.android.com/build/12470370?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap3a.241105.007-b3dbe78d.zip" -readonly ota_sha256="b3dbe78d4de2593bf867e8ba6685794b529f31a03a2a2f49ddd6348539a11c37" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap4a.241205.013-83a37a86.zip" +readonly ota_sha256="83a37a8626630ba32d1fb319f60eeeb31ffcd2d2675db933af513ae1d7884ae7" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/shiba b/vars/shiba index 622f7563..87eb216c 100644 --- a/vars/shiba +++ b/vars/shiba @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap3a.241105.007-factory-b9adba79.zip" -readonly image_sha256="b9adba795ccc33c312635a91a2e46eccbb49d079b7475706576c4a2bb46d4577" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap4a.241205.013-factory-66f111e2.zip" +readonly image_sha256="66f111e269d327e69f5906e1103bf362be122f77f27df14b3be66fea94b1bb09" -readonly flash_url="https://flash.android.com/build/12470370?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap3a.241105.007-85d3297d.zip" -readonly ota_sha256="85d3297d8f02f304a5b2cf4ea5545e6369f8f52b2083ae00c718201c5bd1ed32" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap4a.241205.013-7f13493c.zip" +readonly ota_sha256="7f13493c46dcf18070a5dda5c5a323056f66107e78e054f9ddc3b3bfd6372288" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/tangorpro b/vars/tangorpro index 84a3036c..54fecfc5 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.007" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r4" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12470370" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap3a.241105.007-factory-98ec0c31.zip" -readonly image_sha256="98ec0c31b5e1e6922dd360906d250c9f622746f5a7282c0de1fd24f564f8b697" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap4a.241205.013-factory-04563cd3.zip" +readonly image_sha256="04563cd382ef39225b2b8f1f0ae34904f39edf09d0399f93f15189bd9f2af48e" -readonly flash_url="https://flash.android.com/build/12470370?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap3a.241105.007-7157623d.zip" -readonly ota_sha256="7157623d30fde0e2dab8673f0b64a2d61060622287192308b6b3b60063ac9b12" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap4a.241205.013-7c0e30b1.zip" +readonly ota_sha256="7c0e30b1274730a0e95c34efdd93f7d19624893338f18abb38ac395354c4efba" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" diff --git a/vars/tokay b/vars/tokay index e1d42dfc..2173376d 100644 --- a/vars/tokay +++ b/vars/tokay @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP3A.241105.008" +readonly build_id="AP4A.241205.013" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-release" +readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r2" -readonly aosp_tag="android-15.0.0_r5" +readonly prev_aosp_tag="android-15.0.0_r4" +readonly aosp_tag="android-15.0.0_r6" -readonly build_number="12485168" +readonly build_number="12621605" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap3a.241105.008-factory-ac307537.zip" -readonly image_sha256="ac3075378d2b1e72b555dc44436cc6189b6ba3226a082f8c781dde5dbe39a0cd" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap4a.241205.013-factory-a7bce002.zip" +readonly image_sha256="a7bce00279ebacd994b1bd932cdcfbdce6722a251d946261967cada8063f32e6" -readonly flash_url="https://flash.android.com/build/12485168?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/12621605?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap3a.241105.008-1c012036.zip" -readonly ota_sha256="1c012036f1e00e9be9d46f80afa907d98bbe06665d377a4ee326e90ccde73419" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap4a.241205.013-e7b70ea0.zip" +readonly ota_sha256="e7b70ea0964619ba1420094e18bab58f18115e4c0f151115ec0c44f2ccf2def7" -readonly security_patch="2024-11-05" +readonly security_patch="2024-12-05" From ba137b9c3e3108bb6503b41968a99146155decae Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 24 Dec 2024 00:39:46 +0200 Subject: [PATCH 073/111] vars: Update lineage branch Change-Id: I8972e463a4954f90a385d4da99cf9124fb691c2b --- vars/common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/common b/vars/common index bbcdccd1..0b6b754c 100644 --- a/vars/common +++ b/vars/common @@ -14,7 +14,7 @@ readonly common_aosp_build_id=AP4A.241205.013 # Dec 2024, Pixel 6-9 readonly topic=dec24 -readonly lineageos_branch=lineage-22.0 -readonly lineageos_device_branch=lineage-22.0 +readonly lineageos_branch=lineage-22.1 +readonly lineageos_device_branch=lineage-22.1 readonly merge_method="merge" From 8345bd637ec9ab2d5c39e2cc8dc3e1e8db2721a5 Mon Sep 17 00:00:00 2001 From: Patrick Gaskin Date: Sat, 26 Oct 2024 01:24:26 -0400 Subject: [PATCH 074/111] carriersettings-extractor: Update vendored carrier_list.pb to 20241106 No changes to the protobuf schema. https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/3338063 Change-Id: I28cecf92fcafb1acfc35c50cc768319a6a603e56 --- carriersettings-extractor/carrier_list.pb | Bin 54936 -> 60534 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/carriersettings-extractor/carrier_list.pb b/carriersettings-extractor/carrier_list.pb index 624ffec870dbc2af743c4b0f9f9dfadfcc3182bd..344cfcd7ba72688f33654de4b002cecdffaedacb 100644 GIT binary patch delta 9437 zcmb7K3w&HvnctbbPHtY)lWE%CzHSQ*&Cs;>Ju}4xCdnj?B$<$zwzj{Y;v~6k$0l>b zWTs8obq9Qa2ngj`6m}Jbf`THI;VCZxS44Sed5P|->+)C>7kr_+y6*nZxp$^Bg(92Z zFFC#EeCM3+eCK=ozwh+3x75A)!@4fv5g+l-s$mg_C=g& zf2dt-%@?G}j5VFJvwPFdr~Kx+JZYwZExCQ^{QTaGl(J^5z4olQ84D>cT;J3sgL zcC0ZxeDHx)i#K2_s>_PlQaQosSa+La2e(`UdME$o`FuLZ<)i4b0TMJ}-e?h_i#%M%s378Wc3Ny={hF)^LGnl)ZM3?jt+BYX zsQIUB7n9fOXw!IRpPjd67@Z*-k%-VqepN>slJQh*q7)K-?rZNNhwCZXn$7IWoLjI; zD_g(d^TnM9+B7N#ghowP&8Qsm>k57~=htn2=Sw-W?MviMLIWF%xFm+|wh`HD72bxu z?{GvZ9d4iX7jN>BFF^x#*qPn7xWhe~E_&b1bS-?u10o@t@}gv!-L z(-qn2?i*NjDtW$zu1wBl^1CuQOB%EC`|aFbDQV^Q;jpF4`fjerE`MpM>@qO);fC%W za!V`qrwgJaH0aPz*=@is`+`-lMlbzr-tm9-Q$;aQu1^wt&h)TrZ^kW z4W*Ph`(b}zHF>R-3TKUvNldLF<@coi)UuBJp%r>Mo6hA+XKuaP=QEriZR?(Zd(dQV zKdgxeG4ioCS~r$Rip)Y_SsHJmUgLH~BW`C@; zW;CAQg2OVVyIQ1_-F~jWb0fK?jRv@6rQ|*9L)v-{>Mo+9+Y;v+1cl{Mb<~EDI~h*V|}gBA3qYw!{u>r73VcUPo!u`_BkCSI=JB z+e>b2r(ON_+?>L!@qvDoi_DLxYV5G zl3gezue>D=Ke|s5{Sqn_~S&wA`D7O{_r(XlIGD~!@$`HOZimN?DSLMPOP{*-#czE6rNcM7Bt6b!`#$`h z0rHb}YQA*&kykFb{-wiTddax~e;KLU_2NC3y!_c~d!$r4vp=2Xs*E7W?j9?a&e?y& zA3l@3*$#6^yieRva|Xo-mydv33iRO)s((sL&pTYd=uRK`TnBuImCxDZ{Ymjg=ZSx~ z&<(9-%OJV7gEsWp_I$o{sQ3l{(k0~P4q89R0&Oey!rh1A#RmpTANa_vb-o))?H5k_ zR<|=Q;KXIbUNvk&_xZQ(eV5L?sEawkr#ooVNM_Q?sJ)sugQu6_6FjZSH-@e=>yf@`heaieu%I4PHMb~o!5xIYdv;uy;NK)43bwm z=%Ri*J71WEVfI5k3p0q=8(se0qd9GtDZbO4GcH@=v_E&!YEvB?6wV;O=%B)cH7$+X zQ+us^?Tk(+w;~wimk?VlliO#*2|I1io!p`8n5&T2AoQI;2CUC{@v=C4-|Of)%g%AK z)68hCO!Pi|P`JoP-sqt1@7tBhX7UF-trT;|NyZ7zon1QbQ!yWc`+b+M@bx$^T)wJ> zHbZa1s=N@{HuYncwIHs4>m*$>B77<)VSy;78k!=U zM6LCqFTNc9h7A+_VN+I|wDZu}XOOQ1 zXk(w9oy2NgaJ*G$RBS{i>lbVLLw;ztUjf*H6ONFtLXJ~*b~guvJ=!%qDnV|6#V9aDF#@!-%B9+g!&)F>;v@Z;<~^l#0J z$h`qtml%sXJFZ$lSbqS^Z9QA^rYv&)jubgrB>5mR)6)kEDIv}_W*VB*DV3Exb(WUFiehIJRGB!?!4|y zU(Y7;I#UhU4ve-EdY3WPP)tJ>D?_DKho5OHb=~#>f9a~*|KwYL3b}&PMuz9|>2jzx zWwG4DqnWBkW#`sA-*6tf>*SJf_n=P{$ze)chHQH`LPvk!MADU;YD7x8dv5Y~uOs)< zw@Gza&Qzsb&gT1+(ns%;eJ!2jDE0C!=b`)Gbe?+P{;qNI3Z?CdexR*H-|$FWf(D4H zbKQfd1UEO^Q`wDKYvYIJ7*+w0Q#9wX2mjo&p8SSVA(ful>&8RVL)` zS4zM5=94~O#<}O=%>mCHx*lKQIpFeA*CUVnI+l`yowPYQXHDgEh1pX}zyH?he&_5* zL#10Dz0JRT4Y|9M)(`L8ISi|5)UXX-04uTIa~1bSy)3J?erofORe1ThQ351nG)T=DXb*l>7?ymq$|5Oep6Z) z*hM0bb<#zA+xSH6m^Kih3F@F}5!t!%@riRjKpyX;!7}`?rZZ`27?6!6Ysi`4PZc9X z;VPmgyw_mmM=kduP?Uc}97L7jPiQl5fO}16(-SkXmE&=81*jscrxe7CzRrP@+?-_V$WLQO14o%W0o)VbkFv$%}> zxIA9FlPr9Y{0meB;48h)UJzSwI-SYgFIyahv$VzSm1Ptlc&71!7!u}s@K?oPa!|)q{5I@hJ#$86;wT31Y9PRabrKNlFSLnOhF?* z>!cmyIr~E}on;ahw&pYQZA%DW`PvWBLC4z>y&PV z3(HiII52}Z5nV!!?0B;7wI&Z>Yyc|C8W`(Bs8KcKB61VX7GkH<(WSJMke;F zPTCk>u<{T9GBJ11>%h$a#LTmRU#F^O@^4`&c^!O?0(~(Q?9St#P>nY_X|XvK8ykvG z48yw~^GB6FAw+)NN!xbVg`6~(LpfvG$}y1Ou2b6&$MhR8xjl2L;NPRDU;P)(sP9cn$+I|fK<1ioD*110%MkV+me8U!0ym}UVzZST9-U{! z0g)tntwok@#Lto+9eTKJrg{JE3TS_CYq8)fl47RCYp-Mr&in#<5| zktdgmi6zQEZYk9I} z2sERKu~>gXLP07HN6pWys4#%7!JjmMzYCq#%ZpSNhgNpYB z0E(KbQcj25Yz~lW1-T$d%f&KQbbury!!{30IANtacPC zcx+T99}m*jK4kLcbXZ)CYe&)xufZFL7^`irD6Lc>u(%&sv}m zVBzCf8UGfRkxPQKZWy=*($|rYD^PgWM1UYOv8R%5=K$(5_XcyA+phJV++zrDRBe|_L`y}px>_|pHNl&YWPJ!QxOSO z#62~P-w1xAAwS}6H@PB6n==)d>pIk`Je(yuMi~C>V30PPjr?w}7pZD!3`Oq;&6S`@ z6=Avd+Yy;jT@ez*3DWvZ(n^a1Op+!lL%d z@oi$=_|6#qBx1sH^64N-KVBVPO3W71S$26kAdM-gK&=-jf*Y=LLR{dR87 z22y8fAM@pkVWOhJ2vMxP3M_8R1Gp|66z?V|nhud0Vb+jU_P_#vPhnUT8$+6I$&R@z#xQ$WK&#={qDPN3 zITkaDYQ3T2ao}|FC73OY1dye`jIo!|t3Y{TbuS&aasV`WxbyNA;bK$62tQwD_AytO zFG#TzAc9~FB!>lHfLG;xM(NJH}Wfd1+O%(yvEfuQ%Eu2V=gy93RIYJJY z1q?fdd<{bTYv@r|VQjbJ@_6;{IOteGK{|+zoPel|lvv{Mb+AS zz`Pc8c_grhHKfEyiVVEJJ&h`?Cb!p~uNK8e;KuK$uzY+5!1c||P{KgkJ><@}BP|}E z&1jkl+PmJ4_IT1TNHuadGaDChSCHmA^1|ThJ!L5tk>|Vxo>#FR;c3n{%F;aX!YFmg zP}qBG1$JV36Y&c4#rxj%gb0_+{qIIHCf*@YFM1cGMH3hU&gDUzaBw8Cont6nkE#kf zzggXBm?-SR-9Cg6*_Z0)gg{?f6i)qNICb^{hq7rdU)Y`IP>MbFuypg03LCZRqoY3h zt!40=u~c_TLJY?Hu;o=;WfWdm`8gt^vZ|AR#vPB@`_j@#dUAe)G@PB?T=JN;;67OXEpv+z(-13Np@1GY4fucAjF^Ka{;e)OuBT{d zc$~qnF8l*|6tR1|H95&FW)7>luUxLLWkCkgK^y_{cLNCfGIUf4S)<{VIIOaalQrUA5k^K5tfk0vF1s5 z9mvk(TKI)BUcr;LQ@NvP3CVHPa0iUxa!hD7o31;;vx-JinlHJjtCD$At4kAR0LC=GMWiE53C z9H)rMu2+@^khuK-leZ?zF|_tMs_He0*BFmN0X=Lul(P%GuEwrb$3y9t;oS5q7$KJ`~G}5V#%{Yx+?;_#rqL-(y?Z z%mQcMkfUMYz2u59+6viDvHuFu8%w3clU-Bts=77B5BC03^O_Si*y|2@rI$N|&Ez0o zt90@Ab)R*1{i=zl$dxX2t)X7oOLDFtF@oa?KbOyjRrTv60HNsk7~ zX^cHMlwWc98N2xzy|c;Q)258muznyq=gUXKzG3HQN4uqRVs^r3x5lUc;yW!)ZXBbF z-}1-=gpv~f%4Vfa&rbV_fI~;dXqTHt_G+<|l)y7G2f47T+O$$SKZs!Q^)b4niX2hT zeF|Y7sfIqz=+~0la2p;yFk)f8CjTrdE>Q`REEA2g=XKAmvM0xg%xFf*?PIj9Tn(1S z(&?o8#>;@U8i-ZBjq*IPVsLLAlb#H~hVK}oEnA0p`rO;c-j3ZDP%lenTdpH_V#|Ky gWq5^?j3Ft>AT#3(_6y{S8m#o&w!ls2pMU260kS}+6951J delta 3985 zcmZ`+3sfA{8Sd<|a2a5CxyvI=cnlCif&w$MvkRoYU?C)x-9?s1j8)G715UHM1N*>G z>oL}<$J#a_*SvfrMiaHxM|5h{sELX7RU@g1R;#tv7?Y-rN88i-IC`}Io!yP7DSMVX z```cm_kVu>KOetg-F&~bgnfcR3@+$z^y|Y~Smhh}fe?51Ov#2B<1?Wd*)Ym%ae1sw z5@gZaU|G79D@y<1@-q8;pohH8^fM}vEK8UM60tOpofdE97|O-YWw9wG5nrY8{c2cU zrAIh7oEO^!alN$>%}+m*v#cYGpWJTcQ5BHdWI-gaSrf;pl7TYbtSa85>^sqEccxyi_u9dp5LR7C}DbxU#5pgwdgqCo0x9mdlI8f zTn=mV2%gqfwiJC}#knDsvUP|2#yER~DJ(-fvTz=?JEA0bpBgrX@^5DtH~F-{P0qGo zQPzompM?uUN_-Xd4sQlROH6ZBf*b%W5xzOD|**uFok%pW3k1ZTO2HVT)?fe{!&$Y82ID z{AiO7AH&WMv&=M^Y~Y(O&YVdv8H8dMm|EH86I{ujCiF&$c!A@d67vMX&>HR%3)Y*CV28Ecav@F0jTVrr2L!+*e1wBys32Z@&10JzHh&!kVhx;ao+j8fo3pcOphhVXZ@e&)}l}H zu{D&88ea`;VVEYeWoY4ih@e{lDQqG7Spl{Nf*~`gkg9G{xWdg>q3eL`?+Ti>1DV@oslNQ{FZZ5zM(`S4L${?nYcUL}IU5~aEU<_n4zM&~Krj4t7dxx3vvLJYk zhcA*Was}E&PbcFMTKefcFx6;tw+L(zdZ++r2V+WfTs5g~5dvCv$+^zF#pn(@=K7K` zB}_hBJl`s`wvoZ;uj=a1U3OgJ(7(b|l!|F6Yq{Tpyc$`Btn}jy7Prrd#LT=Hk z=5t_;0C~*i`1sHSFmfpUP(WVNe{6Y=A>9)qyNfZ83Zg`gOl;4gVmxhv@zcqAhAAia z#>$N&v23Qoi=MLMfN-1oF%jmVx{8_^h?Q7rkl6)kk-4eSgQjCvJJ-=-%yo zdt6iaUS&iZ(?&A2L%zEF%Cc(oS37pSzjoL0tM5Ge_>IRlZ{z#<5R|s@*y>%DT#P=p zW2-N?!q|4jj;z857<8Kh%0o@W^j=?x+e-S^TsLF5$bZ*VU_aXC!1*1z9#3UyST!oH zzTLtsB73eWE##n-+=4`X4oLy4@!B;HTA6E&Yp)+=jNBWFEdWc0sqi#%kuz>wS6P8x zcbKs^gY2JHq7lF}$SWC;!AoAf@dP6qdw$WwcrQiA;BbFT8Cgo9a)IegIaS?)qc|0j*ACq2O);e+NQYE5=r_18PMq%_40K7&?f%XnWJlVq^te}a zOKch1=)_q8HJ+HeC3ndlwgPQ(V$>VfqL5k9x!Wy*TV$)y7AIzVhq{}6z@e_5%OJZw zt!yp%*G&rmbxJl=Ilg(VO!_wXYirO}CoTwSkqPMjsUcvl43AsxBwIIJRO&@{I5J=4~v`@_2x0c;mhy5&g!Avpe+YFzh*?x@n8&vf&pcxYC3MizvWX zgs;RdL-&DwBYJe)Y|5Ad9F4KLz^oz5TpdYlsw1~;>f!3p15TWq06=MqK@Uzf253SJ z-y_UskJN^K3$iY(HUUlL8cbl91e^mfFA1&Q^h2ANdGL^d&F@01c*1$ARgiPHtcFgp z2ksfTfKN*Tt>!ii0^5o762-cfBYY>cEW_L33?mCZI)Pz2y z?uVR(GC75*^UR}OkHFcJ=GNs#;_g=qAgF&Y#JLkHd@iFkPrXWEf%}?fbU$*brGiIa z6auichbXp$xx$S0Ch5-Yk6Hj{)?u7YyLv+5oMxG~c?B*_Aum4uQ8kY?!7N7mO+*>F z%oIX92u2cJ1gVWYw!5xK^su#P3x*2OM$=P{Y8==-#MIQF9YF5Z^>Ii+Uq@dkb&up} zHL=M9ZRhMKe{F$z;3<5XQPP}-AkRqtUa_Ph?ldh(O~U(_u?|Hhc5P?jzm zn%^*(csP@oN*!bSGqVh%kcnrPpoOOQBzflkGUM>Gvy7`8&A6cUCe)EcEC~}Em~QNP z{v1nrIodvVqm%mHY-MiQLr%VUrYN8tE^}H^CDY%jxx5w78$iQ%io}^wkzh18O8;P3 zTxIAn7tUI~a^-Tf#z9%xc>jQlah9R|F3h%v6M(1i2GCAyv&pM?^qdQ$Kr(F}BnOPS zP|v4GEQg*4HO$6FGe5O$>j(xz{Q$i$xNuF6Hmt@H(=d%fs;5AM*T?wYBv5s}PaDzG zhPAW_Yy*1Hg$sid2`$pq*G@i|WkD$@4!65i;82FX{$O9Z7aefnqD-$>N1=x=hdD!u zj&k!!^x%B*(7~`9!VT6==u(t_xrI64KvnK$x$1Sk+=ua+;=XP>?%-U3@Px{dy9;@0h1zA-Xj{W0V Date: Wed, 8 Jan 2025 01:06:59 +0530 Subject: [PATCH 075/111] January 2025 Security update Change-Id: I4c28e4a172c5b0ef02c1f7f7968ee317b1abf688 --- vars/akita | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/caiman | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/comet | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/komodo | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- vars/tokay | 20 ++++++++++---------- 16 files changed, 155 insertions(+), 155 deletions(-) diff --git a/vars/akita b/vars/akita index 00f55062..a7ef172e 100644 --- a/vars/akita +++ b/vars/akita @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap4a.241205.013-factory-e77805c2.zip" -readonly image_sha256="e77805c249a00670a1ce972f06b613aa166c2955e7908548f4f2292b0e1db8ec" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap4a.250105.002-factory-1c5c298d.zip" +readonly image_sha256="1c5c298daa1e66408c49a796d61cc16c7f7858eabafa9b6c87c1a32b4359a341" -readonly flash_url="https://flash.android.com/build/12621605?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap4a.241205.013-de582711.zip" -readonly ota_sha256="de582711cb4b8935833b9fb5bf1b9024389051d9bb560dd88ad85c2a747fa8d0" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap4a.250105.002-640ed10d.zip" +readonly ota_sha256="640ed10d073af3320869c5ad4c1747a66cda9195e94d57b1dbd23bc96ca95ba8" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/bluejay b/vars/bluejay index 57c67346..7af9f09b 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap4a.241205.013-factory-f6c5ddf3.zip" -readonly image_sha256="f6c5ddf3646f002d62fc49c58fc9a7199e1e66cb143bef1a38e9b654bbaba858" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap4a.250105.002-factory-72283090.zip" +readonly image_sha256="72283090f956af65694f65f0d9947eefb0c0023f739f9f7eaa0038b008e63491" -readonly flash_url="https://flash.android.com/build/12621605?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap4a.241205.013-10a378a5.zip" -readonly ota_sha256="10a378a57c3389678bd753cd2216af413af057d56deac376b2b36a7525bcea52" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap4a.250105.002-14508b66.zip" +readonly ota_sha256="14508b664b31eb5c6880a0b5bba13905f876ff5a9b6a5be9832a2b1d872edfcb" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/caiman b/vars/caiman index e41a6b11..b4265a3a 100644 --- a/vars/caiman +++ b/vars/caiman @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap4a.241205.013-factory-d7703f4c.zip" -readonly image_sha256="d7703f4cd55e0214d03d35a31cba4c7da1e05966fd68b356653de68ee70c8f9f" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap4a.250105.002-factory-c63e0cc2.zip" +readonly image_sha256="c63e0cc23ddf96bf963dc9e473024ee0059009143addb5d54c5d3731e8ef0317" -readonly flash_url="https://flash.android.com/build/12621605?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap4a.241205.013-b914a097.zip" -readonly ota_sha256="b914a097abef5ecc62792fe9cf103b84c676ba64736e7cdc3802102901c87116" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap4a.250105.002-678a8519.zip" +readonly ota_sha256="678a85190456a7140d34fa2ef10c54c8bd92da2293d6bfca40075649723e4388" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/cheetah b/vars/cheetah index 1137a5c4..0f817424 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap4a.241205.013-factory-93675b9d.zip" -readonly image_sha256="93675b9dfef9aa9b30b1aa29b342e103ead2c3dcfd5c449af4bab4b0626f13ed" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap4a.250105.002-factory-7574869b.zip" +readonly image_sha256="7574869b3d4379a2cd813ab36f42b58f8380f881d5f622a42cc81358b9c4172b" -readonly flash_url="https://flash.android.com/build/12621605?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap4a.241205.013-295dbbca.zip" -readonly ota_sha256="295dbbcad1f40ffc69d788fd34b8bae610d764300d83b9e44f1ba44dbabff5b2" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap4a.250105.002-f36057bd.zip" +readonly ota_sha256="f36057bde1e0a9c49adf89ed9385b3cd3565190cedb2666a3387f14c0f505cdf" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/comet b/vars/comet index aebe21a6..0d6ecc3c 100644 --- a/vars/comet +++ b/vars/comet @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap4a.241205.013-factory-c38dc0ba.zip" -readonly image_sha256="c38dc0bacde39ac8c4be0b709fcf1f816baf0df16f2742f6e7f99cb38c2a5bd9" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap4a.250105.002-factory-aa2a315e.zip" +readonly image_sha256="aa2a315e4b94ccdb010bddbaf8ba567864096ac478cb8b68cce1627736ace4ba" -readonly flash_url="https://flash.android.com/build/12621605?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap4a.241205.013-616bfa66.zip" -readonly ota_sha256="616bfa66d15b5dfd5c76e00d2a8c78a09ffef320eff56d31bcca51d4e8a003b0" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap4a.250105.002-9273a642.zip" +readonly ota_sha256="9273a6429bcee2d0d94fb5bb30bdde30767baa1388e69a2ffda94833339b2264" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/common b/vars/common index 0b6b754c..8d14ec97 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=staging/android15 readonly device_branch=staging/android15 -readonly common_aosp_branch=android15-qpr1-release # Dec 2024 +readonly common_aosp_branch=android15-qpr1-release # Jan 2025 -readonly prev_common_aosp_tag=android-15.0.0_r5 # Nov 2024, Pixel 9 -readonly common_aosp_tag=android-15.0.0_r6 # Dec 2024, Pixel 6-9 +readonly prev_common_aosp_tag=android-15.0.0_r6 # Dec 2024, Pixel 6-9 +readonly common_aosp_tag=android-15.0.0_r10 # Jan 2025, Pixel 6-9 -readonly common_aosp_build_id=AP4A.241205.013 # Dec 2024, Pixel 6-9 +readonly common_aosp_build_id=AP4A.250105.002 # Jan 2025, Pixel 6-9 -readonly topic=dec24 +readonly topic=jan25 readonly lineageos_branch=lineage-22.1 readonly lineageos_device_branch=lineage-22.1 diff --git a/vars/felix b/vars/felix index 47a42dec..289bbf8c 100644 --- a/vars/felix +++ b/vars/felix @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap4a.241205.013-factory-7d1b8f98.zip" -readonly image_sha256="7d1b8f989fee12b493b45b56de99dc5de5c153d3787def11d7c4be2ffb54f725" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap4a.250105.002-factory-2f535487.zip" +readonly image_sha256="2f535487264aea5b68e1243eaf19ff0b542f426411ff2e0effaf051701388147" -readonly flash_url="https://flash.android.com/build/12621605?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap4a.241205.013-a7b7c57f.zip" -readonly ota_sha256="a7b7c57f2e6b5c3384787026781bba7623dec219ecad4eac90d782cc31dec1c9" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap4a.250105.002-6523eab6.zip" +readonly ota_sha256="6523eab624f94e4087717296faa174961bc29ee62da33146c56fa7ab84baf283" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/husky b/vars/husky index f8fb16c7..a9a6f12d 100644 --- a/vars/husky +++ b/vars/husky @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap4a.241205.013-factory-f5de0825.zip" -readonly image_sha256="f5de0825365a63eaa17dc5bf8325cda66dd808ed817e72f2267c7106a8232a8a" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap4a.250105.002-factory-0b0ddde9.zip" +readonly image_sha256="0b0ddde9994194b36a6a98b9335d961bdb4d851777e83023de634ca1e11e3276" -readonly flash_url="https://flash.android.com/build/12621605?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap4a.241205.013-ae93708d.zip" -readonly ota_sha256="ae93708d6df45aac766c34ec4e1e1466c9203d023db0ed16a8dc582891584044" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap4a.250105.002-a9df99e8.zip" +readonly ota_sha256="a9df99e894b6cc17256a35a5c6dfb8a4c31978dda26c4d4b74fedfa46b5a6e92" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/komodo b/vars/komodo index 8ea87710..359b56eb 100644 --- a/vars/komodo +++ b/vars/komodo @@ -11,23 +11,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap4a.241205.013-factory-7675209b.zip" -readonly image_sha256="7675209b3e5b8902e9942b2721d3bea0a8219ceacf1dcc20d05f48036b7a7e35" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap4a.250105.002-factory-1f16cb17.zip" +readonly image_sha256="1f16cb17ce7221aa40dc9ddf3fb8d166257a4a69d8d3751e25528ab867516a67" -readonly flash_url="https://flash.android.com/build/12621605?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap4a.241205.013-9addf596.zip" -readonly ota_sha256="9addf5963f9732b019d29d03d794976903518577a9b89c7fc27a5dd390c88b38" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap4a.250105.002-41ab2eac.zip" +readonly ota_sha256="41ab2eacd26553a88d72a37295604f66eb8807b094d4cad043c482408c16bd38" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/lynx b/vars/lynx index 35a6ddd6..531e64a1 100644 --- a/vars/lynx +++ b/vars/lynx @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap4a.241205.013-factory-2cfa9b95.zip" -readonly image_sha256="2cfa9b95c0b91bc071205abbc0bc86690cb72b01c2b8c9bf152db6922cafb6e6" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap4a.250105.002-factory-9426ca16.zip" +readonly image_sha256="9426ca164b081aa3ed051a123a06a632004459a6913e59a58dacd06344442bae" -readonly flash_url="https://flash.android.com/build/12621605?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap4a.241205.013-c8013227.zip" -readonly ota_sha256="c8013227e36b3186a53f8a47e85bbba4651744f0195831313c37f6cd59beaddc" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap4a.250105.002-c8dc5836.zip" +readonly ota_sha256="c8dc58360421b0db748ecbc16352aed6d559a6c6cf49e31d5b50451f465c1b10" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/oriole b/vars/oriole index 481a6db0..cf4d7ccf 100644 --- a/vars/oriole +++ b/vars/oriole @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap4a.241205.013-factory-93c45019.zip" -readonly image_sha256="93c450196960e4f0b80ee9efe3f2c7f2d6f318eb9d6ae38d9cb0e4bb6969fec4" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap4a.250105.002-factory-242e9271.zip" +readonly image_sha256="242e92719154c8ee3bf906aecddae049798c28108e510cea0d6f011a804fcf7f" -readonly flash_url="https://flash.android.com/build/12621605?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap4a.241205.013-e30e32ff.zip" -readonly ota_sha256="e30e32ff6e7d21e7f647e904a73e4564e4c216f3fdeee2e7ab2528b63a1901f5" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap4a.250105.002-5e0383a4.zip" +readonly ota_sha256="5e0383a4d1a3b6b788fbca7c1d52b7e93702969cbb640a474461ff1dd5165dfb" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/panther b/vars/panther index f5e18e80..b5b78561 100644 --- a/vars/panther +++ b/vars/panther @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap4a.241205.013-factory-3fe89b24.zip" -readonly image_sha256="3fe89b24096c31aa2040471f9929e03f38c07365f0f577624576007e4388231d" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap4a.250105.002-factory-19fbfb65.zip" +readonly image_sha256="19fbfb654a3c566cc993c12335d288af9e57161ceab2a00d0754ccaffe7450ee" -readonly flash_url="https://flash.android.com/build/12621605?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap4a.241205.013-f3cd158f.zip" -readonly ota_sha256="f3cd158f8de85875d4110a0a75ad05d35e2883f4401e034a7b5efe280ff4c7b1" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap4a.250105.002-6e2a6418.zip" +readonly ota_sha256="6e2a641805f44df0f989deb0a87eb69de61d3e82648d3999185854d037f03ab3" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/raven b/vars/raven index b2e0a49b..5de5ff6c 100644 --- a/vars/raven +++ b/vars/raven @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap4a.241205.013-factory-c80f7d84.zip" -readonly image_sha256="c80f7d847f1bd90ec9b4fbd575ece39e3f3987c04cc9a70ffd5895047933f66e" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap4a.250105.002-factory-a6237d24.zip" +readonly image_sha256="a6237d24518841c6d60c1df36932ed31fda9ee55575bef1d1b59f52aeabb6a8a" -readonly flash_url="https://flash.android.com/build/12621605?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap4a.241205.013-83a37a86.zip" -readonly ota_sha256="83a37a8626630ba32d1fb319f60eeeb31ffcd2d2675db933af513ae1d7884ae7" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap4a.250105.002-1653a739.zip" +readonly ota_sha256="1653a7393e55d9d7e85fa57d01a17267caee3e024e9a81f93aa907d7bcb521d9" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/shiba b/vars/shiba index 87eb216c..68cf92d0 100644 --- a/vars/shiba +++ b/vars/shiba @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap4a.241205.013-factory-66f111e2.zip" -readonly image_sha256="66f111e269d327e69f5906e1103bf362be122f77f27df14b3be66fea94b1bb09" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap4a.250105.002-factory-fe54edcd.zip" +readonly image_sha256="fe54edcd0607c29bec24b016655d99128f3597c98561f1d27efa61ecdb5a31a3" -readonly flash_url="https://flash.android.com/build/12621605?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap4a.241205.013-7f13493c.zip" -readonly ota_sha256="7f13493c46dcf18070a5dda5c5a323056f66107e78e054f9ddc3b3bfd6372288" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap4a.250105.002-8973f6e7.zip" +readonly ota_sha256="8973f6e79d0f3a371e5c342b15aa39f30d6f43cfa93d2bb5913d10247cda27f7" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/tangorpro b/vars/tangorpro index 54fecfc5..c45b839e 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap4a.241205.013-factory-04563cd3.zip" -readonly image_sha256="04563cd382ef39225b2b8f1f0ae34904f39edf09d0399f93f15189bd9f2af48e" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap4a.250105.002-factory-8c471fde.zip" +readonly image_sha256="8c471fde1ae795fdd264e4ba9bcb2b93e8a3aa88a8a38df0ad40b3cb4559424f" -readonly flash_url="https://flash.android.com/build/12621605?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap4a.241205.013-7c0e30b1.zip" -readonly ota_sha256="7c0e30b1274730a0e95c34efdd93f7d19624893338f18abb38ac395354c4efba" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap4a.250105.002-f0d8d5e9.zip" +readonly ota_sha256="f0d8d5e9f6d288e10c0b53ca4e6b978a223f965af73f5c6f6b00a19a130b7761" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" diff --git a/vars/tokay b/vars/tokay index 2173376d..3001b605 100644 --- a/vars/tokay +++ b/vars/tokay @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.241205.013" +readonly build_id="AP4A.250105.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r4" -readonly aosp_tag="android-15.0.0_r6" +readonly prev_aosp_tag="android-15.0.0_r6" +readonly aosp_tag="android-15.0.0_r10" -readonly build_number="12621605" +readonly build_number="12701944" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap4a.241205.013-factory-a7bce002.zip" -readonly image_sha256="a7bce00279ebacd994b1bd932cdcfbdce6722a251d946261967cada8063f32e6" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap4a.250105.002-factory-d3f58a9f.zip" +readonly image_sha256="d3f58a9f93f634d8e73992a01df3ef5515fad7cef76b0f3fdb240439db279c45" -readonly flash_url="https://flash.android.com/build/12621605?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/12701944?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap4a.241205.013-e7b70ea0.zip" -readonly ota_sha256="e7b70ea0964619ba1420094e18bab58f18115e4c0f151115ec0c44f2ccf2def7" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap4a.250105.002-d60a3438.zip" +readonly ota_sha256="d60a34387c64b775bed0edda39c20c26138fb7881b8d00a88ae8f8617178acca" -readonly security_patch="2024-12-05" +readonly security_patch="2025-01-05" From f26ecb93d659db11dcf82ce03b6604ce88b3c5d8 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 27 Dec 2024 22:25:37 +0530 Subject: [PATCH 076/111] release: Speed up tag process, LFS * It's so, so much faster to push a LFS tag from a remote-tracking branch than then 'repo' default checked out state. * That holds even when the tag is identical to a previous tag, which is the case for many of our repos Test: (with an unpushed tag testLFStag, that is an existing commit on a branch) git checkout branch git tag -s testLFStag git push remote testLFStag # Takes a long time, interrupt it git checkout -b somebranch remote/branch git push remote testLFStag # Instant, pretty much Issue: https://github.com/git-lfs/git-lfs/issues/3976 Change-Id: I1ddf299cc57ca042f95f1abe34b2dbd0211c81b8 --- release/tag.sh | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/release/tag.sh b/release/tag.sh index 6b266701..4d6b6223 100755 --- a/release/tag.sh +++ b/release/tag.sh @@ -27,8 +27,11 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" +readonly vars_path="${script_path}/../vars" readonly top="${script_path}/../../.." +source "${vars_path}/common" + if [[ -e "${top}/build_kernel.sh" ]]; then readonly excluded_repos='CalyxOS/kernel_manifest' else @@ -52,7 +55,7 @@ handle_repos() { tag_repo "${repo}" "${version}" "${msgfile}" done read -p "Press enter to start pushing" - parallel push_repo {} "${version}" ::: "${repos}" + parallel push_repo {} "${version}" "${os_branch}" "${topic}" ::: "${repos}" popd } @@ -66,7 +69,36 @@ tag_repo() { push_repo() { local repo="${1}" local version="${2}" - git -C "${repo}" push calyx "${version}" + local os_branch="${3}" + local topic="${4}" + pushd "${repo}" + + if [ -f ".lfsconfig" ]; then + # Pushing a LFS tag from a remote-tracking branch is MUCH, MUCH faster + # than the alternative + # Fetch because this remote isn't fetched by default + git fetch calyx "${os_branch}:refs/remotes/calyx/${os_branch}" + # This should match the tag + git checkout -b "lfs_${topic}" "${version}" + git branch --set-upstream-to="calyx/${os_branch}" + fi + + git push calyx "${version}" + + if [ -f ".lfsconfig" ]; then + # Cleanup + git checkout "${version}" + git branch -D "lfs_${topic}" + fi + + popd +} + +cleanup_repo() { + local repo="${1}" + local version="${2}" + pushd "${repo}" + popd } export -f push_repo From a7c59f449d9149ed5d7333517d4c64680a6e471b Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 8 Jan 2025 21:51:04 +0530 Subject: [PATCH 077/111] release: Push 8 tags at once * free for all was fine at first but it's too much now * This seems to work ok, can go lower or higher later, as needed Change-Id: Ia9fd565b2cb95357c3624d442c33255eac6b8cc8 --- release/tag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tag.sh b/release/tag.sh index 4d6b6223..adafea8f 100755 --- a/release/tag.sh +++ b/release/tag.sh @@ -55,7 +55,7 @@ handle_repos() { tag_repo "${repo}" "${version}" "${msgfile}" done read -p "Press enter to start pushing" - parallel push_repo {} "${version}" "${os_branch}" "${topic}" ::: "${repos}" + parallel -j8 push_repo {} "${version}" "${os_branch}" "${topic}" ::: "${repos}" popd } From 084950069b6eaf11b88df8375b46d38453d42bea Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 15 Jan 2025 05:50:10 +0530 Subject: [PATCH 078/111] git-review: android15-qpr1 Change-Id: Ie7abf67a185293e602766a4fd8c48e14fea2b6ba --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 7f733c5a..18f6a98a 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.calyxos.org port=29418 project=CalyxOS/scripts -defaultbranch=staging/android15 +defaultbranch=android15-qpr1 From f117e5dc2dae89877b72b2761aa2ce6685f7a448 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 13 Nov 2024 08:05:07 +0200 Subject: [PATCH 079/111] vars: Update barbet to final build Change-Id: Ic4f63a8a36f09f5f9aaad0eb32bc36376faf830a --- vars/barbet | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vars/barbet b/vars/barbet index 56e3aaab..d0e3f835 100644 --- a/vars/barbet +++ b/vars/barbet @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP2A.240805.005" +readonly build_id="AP2A.240805.005.S4" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android14-qpr3-release" +readonly aosp_branch="android14-qpr3-s14-release" -readonly prev_aosp_tag="android-14.0.0_r52" -readonly aosp_tag="android-14.0.0_r55" +readonly prev_aosp_tag="android-14.0.0_r55" +readonly aosp_tag="android-14.0.0_r75" -readonly build_number="12025142" +readonly build_number="12281092" -readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240805.005-factory-231e0672.zip" -readonly image_sha256="231e06729299ce594d8b929a0db7d2cb845e74d0fb014b9938f515d0d3f9703c" +readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap2a.240805.005.s4-factory-eb064cd6.zip" +readonly image_sha256="eb064cd61c8e95ace5f2e2a3c2f29d72fb716f2cc4fa12d742c2fae9c934002c" -readonly flash_url="https://flash.android.com/build/12025142?target=barbet-user&signed" +readonly flash_url="https://flash.android.com/build/12281092?target=barbet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240805.005-44633b16.zip" -readonly ota_sha256="44633b16c66bd19bdf160bf6d65af95b7d038c8a172a972f4f38843146d06ffe" +readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap2a.240805.005.s4-65a8b7c3.zip" +readonly ota_sha256="65a8b7c3a4ad3a14a0b5b38b24adb05e64ba7f69d03b40e82e33260cc7ef8c33" readonly security_patch="2024-08-05" From 7b23fb2cb48ffc08566fffb5e2d7a14f6225cfb1 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 3 Sep 2024 05:45:15 +0300 Subject: [PATCH 080/111] vars: Update fairphone to latest zips Change-Id: I81464ec396a2b7c99f963f815d315ab5688e18aa --- vars/FP4 | 8 ++++---- vars/FP5 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vars/FP4 b/vars/FP4 index 16d9272d..4222f6ee 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP4.TP2G.C.0119" +readonly build_id="FP4.TP2N.C.0128" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2G-factory.zip" -readonly image_sha256="9979a11e832a3911fbabcb3207f90560b5a4c3eab3c4a4c81267023e84d057d8" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2N-factory.zip" +readonly image_sha256="19320102d2d36cef2096e205ad85955da081510656329de34e2511d9c40ea832" -readonly security_patch="2024-05-05" +readonly security_patch="2024-11-05" diff --git a/vars/FP5 b/vars/FP5 index 11044df6..9de7f938 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.TT4H.A.162" +readonly build_id="FP5.UT2H.B.088" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A13/FP5-TT4H-factory.zip" -readonly image_sha256="38f5cded3cceca25cbf7c9d42ad664ec232a9b1446f3ae17053fe97d7110da01" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2H-factory.zip" +readonly image_sha256="2da0b370f71121e858951c002ee86773537b6ea47de925700872699de99472b4" -readonly security_patch="2024-06-05" +readonly security_patch="2024-11-05" From f733dfab803e9453c1afd8cbeac34ebfc82dd6c3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 28 Dec 2024 07:41:37 +0200 Subject: [PATCH 081/111] Align fairphone scripts with pixel Change-Id: Idf48fb99af3f61f64fb5f6b2648bc0dc854ae18e --- fairphone/common | 6 --- fairphone/device.sh | 27 ++++++++--- fairphone/download.sh | 9 +++- fairphone/extract-factory-image.sh | 73 ------------------------------ 4 files changed, 28 insertions(+), 87 deletions(-) delete mode 100644 fairphone/common delete mode 100755 fairphone/extract-factory-image.sh diff --git a/fairphone/common b/fairphone/common deleted file mode 100644 index a447b7f9..00000000 --- a/fairphone/common +++ /dev/null @@ -1,6 +0,0 @@ -### CONSTANTS ### -readonly vars_path="${script_path}/../vars" -readonly top="${script_path}/../../.." - -readonly work_dir="${WORK_DIR:-/tmp/fairphone}" -readonly device="${1}" diff --git a/fairphone/device.sh b/fairphone/device.sh index 96962403..fe66e892 100755 --- a/fairphone/device.sh +++ b/fairphone/device.sh @@ -24,8 +24,14 @@ set -euo pipefail trap 'exit $?' EXIT trap 'error_m interrupted!' SIGINT -readonly script_path="$(dirname "$(realpath "$0")")" -source "${script_path}/common" +### CONSTANTS ### +readonly script_path="$(cd "$(dirname "$0")";pwd -P)" +readonly vars_path="${script_path}/../vars" +readonly top="${script_path}/../../.." + +readonly work_dir="${WORK_DIR:-/tmp/fairphone}" + +KEEP_DUMP=${KEEP_DUMP:-false} ## HELP MESSAGE (USAGE INFO) # TODO @@ -33,15 +39,24 @@ source "${script_path}/common" ### FUNCTIONS ### device() { + local device="${1}" source "${vars_path}/${device}" - local factory_dir="${work_dir}/${device}/${build_id}/factory" + local factory_zip="${work_dir}/${device}/${build_id}/$(basename ${image_url})" + local extract_args="${factory_zip}" "${script_path}/download.sh" "${device}" - "${script_path}/extract-factory-image.sh" "${device}" + + if [ "$KEEP_DUMP" == "true" ] || [ "$KEEP_DUMP" == "1" ]; then + extract_args+=" --keep-dump" + fi + + extract_args+=" --extract-factory" pushd "${top}" - device/fairphone/${device}/extract-files.sh "${factory_dir}/images" + device/fairphone/${device}/extract-files.py "${extract_args}" popd + + echo "${build_id}" > "${top}/vendor/fairphone/${device}/build_id.txt" } # error message @@ -59,7 +74,7 @@ help_message() { main() { if [[ $# -eq 1 ]] ; then - device + device "${1}" else error_m fi diff --git a/fairphone/download.sh b/fairphone/download.sh index a66edbdb..aeabfafc 100755 --- a/fairphone/download.sh +++ b/fairphone/download.sh @@ -25,8 +25,13 @@ set -euo pipefail trap 'exit $?' EXIT trap 'error_m interrupted!' SIGINT -readonly script_path="$(dirname "$(realpath "$0")")" -source "${script_path}/common" +### CONSTANTS ### +readonly script_path="$(cd "$(dirname "$0")";pwd -P)" +readonly vars_path="${script_path}/../vars" + +readonly work_dir="${WORK_DIR:-/tmp/fairphone}" + +readonly device="${1}" source "${vars_path}/${device}" ## HELP MESSAGE (USAGE INFO) diff --git a/fairphone/extract-factory-image.sh b/fairphone/extract-factory-image.sh deleted file mode 100755 index 7a77f6c1..00000000 --- a/fairphone/extract-factory-image.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022-2024 The Calyx Institute -# -# SPDX-License-Identifier: Apache-2.0 - -# -# extract-factory-image: -# -# Extract Fairphone factory images -# -# -############################################################################## - - -### SET ### - -# use bash strict mode -set -euo pipefail - - -### TRAPS ### - -# trap signals for clean exit -trap 'exit $?' EXIT -trap 'error_m interrupted!' SIGINT - -readonly script_path="$(dirname "$(realpath "$0")")" -source "${script_path}/common" -source "${vars_path}/${device}" - -## HELP MESSAGE (USAGE INFO) -# TODO - -### FUNCTIONS ### - -extract_factory_image() { - local factory_dir="${work_dir}/${device}/${build_id}/factory" - if [[ -d "${factory_dir}" ]]; then - echo "Skipping factory image extraction, ${factory_dir} already exists" - exit - fi - mkdir -p "${factory_dir}" - local factory_zip="${work_dir}/${device}/${build_id}/$(basename ${image_url})" - echo "${image_sha256} ${factory_zip}" | sha256sum --check --status - pushd "${factory_dir}" - unzip -o "${factory_zip}" - popd -} - -# error message -# ARG1: error message for STDERR -# ARG2: error status -error_m() { - echo "ERROR: ${1:-'failed.'}" 1>&2 - return "${2:-1}" -} - -# print help message. -help_message() { - echo "${help_message:-'No help available.'}" -} - -main() { - extract_factory_image -} - -### RUN PROGRAM ### - -main "${@}" - - -## From a33caacb04aca46eb6f6c64263754de2c0d77f92 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Fri, 10 Jan 2025 02:12:42 +0200 Subject: [PATCH 082/111] update-device-vars: optimize Allow passing multiple devices at once to get-new-device-vars.py. Do all possible web page requests only once for all devices involved. Create soup parsers only once. Change-Id: I33210c1e406188c85b5aa782909c25fdb4ba2f15 --- pixel/get-new-device-vars.py | 105 +++++++++++++++++++++++------------ pixel/update-device-vars.sh | 28 ++++++++-- 2 files changed, 90 insertions(+), 43 deletions(-) diff --git a/pixel/get-new-device-vars.py b/pixel/get-new-device-vars.py index 763e668e..dd00fc49 100755 --- a/pixel/get-new-device-vars.py +++ b/pixel/get-new-device-vars.py @@ -6,6 +6,7 @@ import argparse import base64 +from functools import partial from bs4 import BeautifulSoup from git import cmd import os @@ -24,23 +25,19 @@ SECURITY_PATCH_URL = "https://android.googlesource.com/platform/build/+/refs/{}/core/version_defaults.mk?format=TEXT" SECURITY_PATCH_FILTER = "PLATFORM_SECURITY_PATCH :=" -def handle_image(html_id): - image_html = urllib.request.urlopen(urllib.request.Request(IMAGE_URL, headers=COOKIE)).read() - soup = BeautifulSoup(image_html, 'html.parser') +def handle_image(soup, html_id, output_fn): td = soup.find(id=html_id).find_all('td') flash_url = td[1].a['href'] image_url = td[2].a['href'] image_sha256 = td[3].contents[0] build_number = flash_url.split("/")[4].split("?")[0] - print('new_build_number="{0}"\nnew_flash_url="{1}"\nnew_image_url="{2}"\nnew_image_sha256="{3}"'.format(build_number, flash_url, image_url, image_sha256)) + output_fn('new_build_number="{0}"\nnew_flash_url="{1}"\nnew_image_url="{2}"\nnew_image_sha256="{3}"'.format(build_number, flash_url, image_url, image_sha256)) -def handle_ota(html_id): - ota_html = urllib.request.urlopen(urllib.request.Request(OTA_URL, headers=COOKIE)).read() - soup = BeautifulSoup(ota_html, 'html.parser') +def handle_ota(soup, html_id, output_fn): td = soup.find(id=html_id).find_all('td') ota_url = td[1].a['href'] ota_sha256 = td[2].contents[0] - print('new_ota_url="{0}"\nnew_ota_sha256="{1}"'.format(ota_url, ota_sha256)) + output_fn('new_ota_url="{0}"\nnew_ota_sha256="{1}"'.format(ota_url, ota_sha256)) def get_all_aosp_branches(branch_filter): all_branches = [] @@ -55,21 +52,16 @@ def get_all_aosp_branches(branch_filter): except Exception as e: return all_branches -def get_aosp_branch_for_build_id(aosp_branches, wanted_build_id): +def get_aosp_branches_for_build_ids(aosp_branches, m): try: for aosp_branch in aosp_branches: output = base64.decodebytes(urllib.request.urlopen(BUILD_ID_URL.format("heads/" + aosp_branch)).read()).decode() for line in output.split('\n'): if BUILD_ID_FILTER in line: found_build_id = line.split("=")[1] - if found_build_id == wanted_build_id: - print('new_aosp_branch="{0}"'.format(aosp_branch)) - return aosp_branch - print('new_aosp_branch="unknown"') - return 'unknown' + m[found_build_id] = aosp_branch except Exception as e: - print('new_aosp_branch="unknown"') - return 'unknown' + pass def get_all_aosp_tags(tag_filter): all_tags = [] @@ -84,48 +76,87 @@ def get_all_aosp_tags(tag_filter): except Exception as e: return all_tags -def get_aosp_tag_for_build_id(aosp_tags, wanted_build_id): +def get_aosp_tags_for_build_ids(aosp_tags, m): try: for aosp_tag in aosp_tags: output = base64.decodebytes(urllib.request.urlopen(BUILD_ID_URL.format("tags/" + aosp_tag)).read()).decode() for line in output.split('\n'): if BUILD_ID_FILTER in line: found_build_id = line.split("=")[1] - if found_build_id == wanted_build_id: - print('new_aosp_tag="{0}"'.format(aosp_tag)) - return aosp_tag - print('new_aosp_tag="unknown"') - return 'unknown' + m[found_build_id] = aosp_tag except Exception as e: - print('new_aosp_tag="unknown"') - return 'unknown' + pass def get_security_patch_for_aosp_tag(aosp_tag): try: output = base64.decodebytes(urllib.request.urlopen(SECURITY_PATCH_URL.format("tags/" + aosp_tag)).read()).decode() except: - print('new_security_patch=unknown') - return + return None + for line in output.split('\n'): if SECURITY_PATCH_FILTER in line: security_patch = line.split(":=")[1].strip() - print('new_security_patch="{0}"'.format(security_patch)) - return - print('new_security_patch="unknown"') + return security_patch + + return None + +def get_security_patches_for_aosp_tags(aosp_tags, m): + for aosp_tag in aosp_tags: + security_patch = get_security_patch_for_aosp_tag(aosp_tag) + if security_patch is None: + continue + + m[aosp_tag] = security_patch + def main(): parser = argparse.ArgumentParser() - parser.add_argument('-b', '--build_id', help="Build ID", type=str, required=True) - parser.add_argument('-d', '--device', help="Device codename", type=str, required=True) + parser.add_argument('--devices', help="Device codenames", type=str, nargs='+', required=True) + parser.add_argument('--build-ids', help="Build IDs", type=str, nargs='+', required=True) + parser.add_argument('--tmps', help="Temporary files to store device vars into", type=str, nargs='+', required=True) parser.add_argument('-t', '--tags_match', help='Android version tag to match, such as android-13.0', type=str, required=True) parser.add_argument('-br', '--branch_match', help='Android version branch to match, such as android13', type=str, required=True) args = parser.parse_args() - html_id = "{0}{1}".format(args.device, args.build_id.lower()) - handle_image(html_id) - handle_ota(html_id) - get_aosp_branch_for_build_id(get_all_aosp_branches("{0}*".format(args.branch_match)), args.build_id.upper()) - aosp_tag = get_aosp_tag_for_build_id(get_all_aosp_tags("{0}*".format(args.tags_match)), args.build_id.upper()) - get_security_patch_for_aosp_tag(aosp_tag) + + assert len(args.devices) == len(args.build_ids) == len(args.tmps) + + image_html = urllib.request.urlopen(urllib.request.Request(IMAGE_URL, headers=COOKIE)).read() + image_soup = BeautifulSoup(image_html, 'html.parser') + + ota_html = urllib.request.urlopen(urllib.request.Request(OTA_URL, headers=COOKIE)).read() + ota_soup = BeautifulSoup(ota_html, 'html.parser') + + all_aosp_branches = get_all_aosp_branches("{0}*".format(args.branch_match)) + build_id_aosp_branch_map = {} + get_aosp_branches_for_build_ids(all_aosp_branches, build_id_aosp_branch_map) + + all_aosp_tags = get_all_aosp_tags("{0}*".format(args.tags_match)) + build_id_aosp_tag_map = {} + get_aosp_tags_for_build_ids(all_aosp_tags, build_id_aosp_tag_map) + + aosp_tag_security_patch_map = {} + get_security_patches_for_aosp_tags(all_aosp_tags, aosp_tag_security_patch_map) + + def handle_device(device, build_id, output_fn): + html_id = "{0}{1}".format(device, build_id.lower()) + handle_image(image_soup, html_id, output_fn) + handle_ota(ota_soup, html_id, output_fn) + aosp_branch = build_id_aosp_branch_map.get(build_id, 'unknown') + output_fn('new_aosp_branch="{0}"'.format(aosp_branch)) + aosp_tag = build_id_aosp_tag_map.get(build_id, 'unknown') + output_fn('new_aosp_tag="{0}"'.format(aosp_tag)) + security_patch = aosp_tag_security_patch_map.get(aosp_tag, 'unknown') + output_fn('new_security_patch="{0}"'.format(security_patch)) + + for device, build_id, tmp in zip(args.devices, args.build_ids, args.tmps): + with open(tmp, 'w', encoding='utf-8') as f: + def output_fns(fs, s): + fs.write(s) + fs.write('\n') + + output_fn = partial(output_fns, f) + handle_device(device, build_id, output_fn) + if __name__ == "__main__": main() diff --git a/pixel/update-device-vars.sh b/pixel/update-device-vars.sh index 5d2ffff5..83d4b877 100755 --- a/pixel/update-device-vars.sh +++ b/pixel/update-device-vars.sh @@ -57,17 +57,34 @@ help_message() { main() { mkdir -p "${tmp_dir}" if [[ $# -ne 0 ]]; then - local ds="${@}" + ds=("${@}") else - local ds="${devices[@]}" + ds=("${devices[@]}") fi - for d in ${ds}; do + declare -a tmps + declare -a build_ids + for d in "${ds[@]}"; do + local tmp=$(mktemp "${tmp_dir}/${d}.XXXXXXXXXX") + tmps+=("$tmp") + + # Variables are marked readonly, do this to avoid it + build_id=$( + local dv="${vars_path}/${d}" + source "${dv}" + echo "${build_id}" + ) + build_ids+=("${build_id}") + done + + ${script_path}/get-new-device-vars.py --devices "${ds[@]}" --build-ids "${build_ids[@]}" --tmps "${tmps[@]}" -t ${aosp_tag_match} -br ${os_branch} + + for i in "${!ds[@]}"; do + d="${ds[$i]}" + tmp="${tmps[$i]}" ( - local tmp=$(mktemp "${tmp_dir}/${d}.XXXXXXXXXX") local dv="${vars_path}/${d}" source "${dv}" - ${script_path}/get-new-device-vars.py -b "${build_id}" -d "${d}" -t ${aosp_tag_match} -br ${os_branch}> "${tmp}" source "${tmp}" if [[ "${new_aosp_branch}" != "${aosp_branch}" ]]; then sed -i "/ aosp_branch=/c\readonly aosp_branch=\"$new_aosp_branch\"" "${dv}" @@ -84,7 +101,6 @@ main() { sed -i "/ ota_sha256=/c\readonly ota_sha256=\"$new_ota_sha256\"" "${dv}" sed -i "/ security_patch=/c\readonly security_patch=\"$new_security_patch\"" "${dv}" ) - sleep 10s done } From bcdcdf041b5c9acfeb2e44ec20c3bfe450ccadd6 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Fri, 10 Jan 2025 03:09:55 +0200 Subject: [PATCH 083/111] update-device-vars: add support for new security patch location Change-Id: Ieb5daab75880dc696565748a3dd7102d8309c214 --- pixel/get-new-device-vars.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pixel/get-new-device-vars.py b/pixel/get-new-device-vars.py index dd00fc49..65f10540 100755 --- a/pixel/get-new-device-vars.py +++ b/pixel/get-new-device-vars.py @@ -7,6 +7,7 @@ import argparse import base64 from functools import partial +import re from bs4 import BeautifulSoup from git import cmd import os @@ -24,6 +25,8 @@ BUILD_ID_FILTER = "BUILD_ID=" SECURITY_PATCH_URL = "https://android.googlesource.com/platform/build/+/refs/{}/core/version_defaults.mk?format=TEXT" SECURITY_PATCH_FILTER = "PLATFORM_SECURITY_PATCH :=" +NEW_SECURITY_PATCH_URL = "https://android.googlesource.com/platform/build/release/+/refs/tags/{}/flag_values/{}/RELEASE_PLATFORM_SECURITY_PATCH.textproto?format=TEXT" +NEW_SECURITY_PATCH_FILTER = "string_value: " def handle_image(soup, html_id, output_fn): td = soup.find(id=html_id).find_all('td') @@ -109,6 +112,35 @@ def get_security_patches_for_aosp_tags(aosp_tags, m): m[aosp_tag] = security_patch +def get_security_patch(aosp_tag, release): + try: + url = NEW_SECURITY_PATCH_URL.format(aosp_tag, release) + output = base64.decodebytes(urllib.request.urlopen(url).read()).decode() + except: + return None + + for line in output.split('\n'): + if NEW_SECURITY_PATCH_FILTER in line: + match = re.search(r'\d{4}-\d{2}-\d{2}', line) + security_patch = match.group(0) if match else None + return security_patch + + return None + + +def get_security_patches(aosp_tags, build_ids, m): + for build_id in build_ids: + release, _ = build_id.split('.', 1) + release = release.lower() + + for aosp_tag in aosp_tags: + security_patch = get_security_patch(aosp_tag, release) + if security_patch is None: + continue + + m[aosp_tag] = security_patch + + def main(): parser = argparse.ArgumentParser() parser.add_argument('--devices', help="Device codenames", type=str, nargs='+', required=True) @@ -131,11 +163,14 @@ def main(): get_aosp_branches_for_build_ids(all_aosp_branches, build_id_aosp_branch_map) all_aosp_tags = get_all_aosp_tags("{0}*".format(args.tags_match)) + build_ids = set(args.build_ids) + build_id_aosp_tag_map = {} get_aosp_tags_for_build_ids(all_aosp_tags, build_id_aosp_tag_map) aosp_tag_security_patch_map = {} get_security_patches_for_aosp_tags(all_aosp_tags, aosp_tag_security_patch_map) + get_security_patches(all_aosp_tags, build_ids, aosp_tag_security_patch_map) def handle_device(device, build_id, output_fn): html_id = "{0}{1}".format(device, build_id.lower()) From 58b9db96572df08e428df05a914ed8ca65c57281 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 16 Jan 2025 00:47:18 +0200 Subject: [PATCH 084/111] Call extract-files.py from inside the device tree Running the scripts from $TOP through another script runs into various issues on some devices and passing arguments also has some issues. Change-Id: I887ddba517fba213c05374ff229e7ac8a2164e6d --- fairphone/device.sh | 4 ++-- pixel/device.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fairphone/device.sh b/fairphone/device.sh index fe66e892..ad29a0d9 100755 --- a/fairphone/device.sh +++ b/fairphone/device.sh @@ -52,8 +52,8 @@ device() { extract_args+=" --extract-factory" - pushd "${top}" - device/fairphone/${device}/extract-files.py "${extract_args}" + pushd "${top}/device/fairphone/${device}" + ./extract-files.py ${extract_args} popd echo "${build_id}" > "${top}/vendor/fairphone/${device}/build_id.txt" diff --git a/pixel/device.sh b/pixel/device.sh index 25c0c362..4b1fa72e 100755 --- a/pixel/device.sh +++ b/pixel/device.sh @@ -54,8 +54,8 @@ device() { extract_args+=" --extract-factory --regenerate" - pushd "${top}" - device/google/${device}/extract-files.py "${extract_args}" + pushd "${top}/device/google/${device}" + ./extract-files.py ${extract_args} popd echo "${build_id}" > "${top}/vendor/google/${device}/build_id.txt" From a5b0f4c174cf6dfcd95564382269461d81991766 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 15 Jan 2025 04:46:26 +0200 Subject: [PATCH 085/111] vars: Add otter Change-Id: I7813d59018555d5f0c4e54091b17b271545e017d --- vars/devices | 1 + vars/lineage_devices | 1 + vars/otter | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 vars/otter diff --git a/vars/devices b/vars/devices index a2f889b2..dfc5c83d 100644 --- a/vars/devices +++ b/vars/devices @@ -27,4 +27,5 @@ readonly devices=( sunfish coral flame + otter ) diff --git a/vars/lineage_devices b/vars/lineage_devices index d17e40d8..af22744d 100644 --- a/vars/lineage_devices +++ b/vars/lineage_devices @@ -6,4 +6,5 @@ readonly lineage_devices=( devon hawao rhode + otter ) diff --git a/vars/otter b/vars/otter new file mode 100644 index 00000000..491879ae --- /dev/null +++ b/vars/otter @@ -0,0 +1,15 @@ +# SHIFTphone 8 + +# Usage: ${device_repos[@]} +device_repos=( + device/shift/otter + kernel/shift/qcm6490 +) + +# Updated manually +readonly build_id="SOS.6.0.20241128" + +readonly image_url="https://downloads.shiftphones.com/builds/OTTER.SOS.6.0.G-RELEASE-20241128-OTA.zip" +readonly image_sha256="72ac3572b6de152563107afef1e5f1f7e63ed4dd79bb98df50ad5af6ec89ac20" + +readonly security_patch="2024-10-05" From 73c899de5587619e46ac915d840a6999bda12ed5 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 20 Jan 2025 13:34:15 +0200 Subject: [PATCH 086/111] vars: Reorder devices again Change-Id: I5b6c424b51aa21c82f89c32b8a8427f348eb00dd --- vars/devices | 6 +++--- vars/lineage_devices | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vars/devices b/vars/devices index dfc5c83d..01636342 100644 --- a/vars/devices +++ b/vars/devices @@ -3,9 +3,9 @@ readonly devices=( FP5 FP4 - devon - hawao rhode + hawao + devon comet komodo caiman @@ -21,11 +21,11 @@ readonly devices=( bluejay raven oriole + otter barbet redfin bramble sunfish coral flame - otter ) diff --git a/vars/lineage_devices b/vars/lineage_devices index af22744d..aaccb2b6 100644 --- a/vars/lineage_devices +++ b/vars/lineage_devices @@ -3,8 +3,8 @@ readonly lineage_devices=( FP5 FP4 - devon - hawao rhode + hawao + devon otter ) From 633041a9e41e60ac4b12f116046688e94b04f367 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 24 Jan 2025 02:23:50 +0530 Subject: [PATCH 087/111] vars: staging/android15 -> android15-qpr1 Change-Id: Ib0550cb006fcce70351d6db3cc59b19c5bd20b9a --- vars/common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/common b/vars/common index 8d14ec97..8da3f3cf 100644 --- a/vars/common +++ b/vars/common @@ -2,8 +2,8 @@ readonly android_version=15 # For build-desc-fingerprint.sh readonly aosp_tag_match=android-15.0 # For update-device-vars.sh -readonly os_branch=staging/android15 -readonly device_branch=staging/android15 +readonly os_branch=android15-qpr1 +readonly device_branch=android15-qpr1 readonly common_aosp_branch=android15-qpr1-release # Jan 2025 From 8f36daf619c47f7e4f6dc13736573224dbe544a1 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 5 Feb 2025 01:22:20 +0530 Subject: [PATCH 088/111] February 2025 Security update Change-Id: I84d09d6c9b8a9337ca3e1287159ce054f241b8da --- vars/akita | 20 ++++++++++---------- vars/bluejay | 20 ++++++++++---------- vars/caiman | 20 ++++++++++---------- vars/cheetah | 20 ++++++++++---------- vars/comet | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/komodo | 20 ++++++++++---------- vars/lynx | 20 ++++++++++---------- vars/oriole | 20 ++++++++++---------- vars/panther | 20 ++++++++++---------- vars/raven | 20 ++++++++++---------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 20 ++++++++++---------- vars/tokay | 20 ++++++++++---------- 16 files changed, 155 insertions(+), 155 deletions(-) diff --git a/vars/akita b/vars/akita index a7ef172e..34d6a3ab 100644 --- a/vars/akita +++ b/vars/akita @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap4a.250105.002-factory-1c5c298d.zip" -readonly image_sha256="1c5c298daa1e66408c49a796d61cc16c7f7858eabafa9b6c87c1a32b4359a341" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap4a.250205.002-factory-0da0522c.zip" +readonly image_sha256="0da0522c4ed8d2c18578dc5a27e4efa65c4594b4157d4db34ccc20992bcd5019" -readonly flash_url="https://flash.android.com/build/12701944?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap4a.250105.002-640ed10d.zip" -readonly ota_sha256="640ed10d073af3320869c5ad4c1747a66cda9195e94d57b1dbd23bc96ca95ba8" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap4a.250205.002-7de23674.zip" +readonly ota_sha256="7de23674cbb43bdb748f346796b5d8a21ec5cf82dcc3de8a35020566bc330de3" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/bluejay b/vars/bluejay index 7af9f09b..7c3ef56d 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap4a.250105.002-factory-72283090.zip" -readonly image_sha256="72283090f956af65694f65f0d9947eefb0c0023f739f9f7eaa0038b008e63491" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap4a.250205.002-factory-6e330d72.zip" +readonly image_sha256="6e330d725784defb188a58a5cfa31ba4720457d89c7c77ce2cc261b9bdeb0145" -readonly flash_url="https://flash.android.com/build/12701944?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap4a.250105.002-14508b66.zip" -readonly ota_sha256="14508b664b31eb5c6880a0b5bba13905f876ff5a9b6a5be9832a2b1d872edfcb" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap4a.250205.002-0050fec3.zip" +readonly ota_sha256="0050fec36449d663e487a2169c81b23670b775020adb7d93a30789fc3ca6ddea" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/caiman b/vars/caiman index b4265a3a..0d509708 100644 --- a/vars/caiman +++ b/vars/caiman @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap4a.250105.002-factory-c63e0cc2.zip" -readonly image_sha256="c63e0cc23ddf96bf963dc9e473024ee0059009143addb5d54c5d3731e8ef0317" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap4a.250205.002-factory-651a08f8.zip" +readonly image_sha256="651a08f8b932fbc635eac80a0132506333fbffd6d369c5fb81a8edb7d51e8814" -readonly flash_url="https://flash.android.com/build/12701944?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap4a.250105.002-678a8519.zip" -readonly ota_sha256="678a85190456a7140d34fa2ef10c54c8bd92da2293d6bfca40075649723e4388" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap4a.250205.002-2e8a8511.zip" +readonly ota_sha256="2e8a851108d2567be61f6252f76c9d1f38a516cea4fe0066d10764eecc803d96" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/cheetah b/vars/cheetah index 0f817424..f93799df 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap4a.250105.002-factory-7574869b.zip" -readonly image_sha256="7574869b3d4379a2cd813ab36f42b58f8380f881d5f622a42cc81358b9c4172b" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap4a.250205.002-factory-6a87c591.zip" +readonly image_sha256="6a87c591a5d6811a3b102a440743cbad8fdc10e553cd4df8906dccc6980afc7c" -readonly flash_url="https://flash.android.com/build/12701944?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap4a.250105.002-f36057bd.zip" -readonly ota_sha256="f36057bde1e0a9c49adf89ed9385b3cd3565190cedb2666a3387f14c0f505cdf" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap4a.250205.002-259bb787.zip" +readonly ota_sha256="259bb787fd9f7daec276293ef1fc69948e5a9180161a4fab25d567d209717c29" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/comet b/vars/comet index 0d6ecc3c..1bc89586 100644 --- a/vars/comet +++ b/vars/comet @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap4a.250105.002-factory-aa2a315e.zip" -readonly image_sha256="aa2a315e4b94ccdb010bddbaf8ba567864096ac478cb8b68cce1627736ace4ba" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap4a.250205.002-factory-911704e4.zip" +readonly image_sha256="911704e4f7d56343b6211046d89e5f421f62cc8c7cc1fb071f07137965cf3d46" -readonly flash_url="https://flash.android.com/build/12701944?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap4a.250105.002-9273a642.zip" -readonly ota_sha256="9273a6429bcee2d0d94fb5bb30bdde30767baa1388e69a2ffda94833339b2264" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap4a.250205.002-5b998617.zip" +readonly ota_sha256="5b998617ac3dc94ed3951b4ff8bb0cbf5e12e9381e559abc2f185d1588db499d" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/common b/vars/common index 8da3f3cf..128d571d 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=android15-qpr1 readonly device_branch=android15-qpr1 -readonly common_aosp_branch=android15-qpr1-release # Jan 2025 +readonly common_aosp_branch=android15-qpr1-release # Feb 2025 -readonly prev_common_aosp_tag=android-15.0.0_r6 # Dec 2024, Pixel 6-9 -readonly common_aosp_tag=android-15.0.0_r10 # Jan 2025, Pixel 6-9 +readonly prev_common_aosp_tag=android-15.0.0_r10 # Jan 2025, Pixel 6-9 +readonly common_aosp_tag=android-15.0.0_r14 # Feb 2025, Pixel 6-9 -readonly common_aosp_build_id=AP4A.250105.002 # Jan 2025, Pixel 6-9 +readonly common_aosp_build_id=AP4A.250205.002 # Feb 2025, Pixel 6-9 -readonly topic=jan25 +readonly topic=feb25 readonly lineageos_branch=lineage-22.1 readonly lineageos_device_branch=lineage-22.1 diff --git a/vars/felix b/vars/felix index 289bbf8c..b3eda92a 100644 --- a/vars/felix +++ b/vars/felix @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap4a.250105.002-factory-2f535487.zip" -readonly image_sha256="2f535487264aea5b68e1243eaf19ff0b542f426411ff2e0effaf051701388147" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap4a.250205.002-factory-a1bcd5a5.zip" +readonly image_sha256="a1bcd5a54f8a4d8932d212a1b0e42fcdb580a236d738c808f37f442efd79a463" -readonly flash_url="https://flash.android.com/build/12701944?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap4a.250105.002-6523eab6.zip" -readonly ota_sha256="6523eab624f94e4087717296faa174961bc29ee62da33146c56fa7ab84baf283" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap4a.250205.002-e82e1aab.zip" +readonly ota_sha256="e82e1aab01ce5d706b8f949dd992c160067f600c7e1435bf697304ef70a0b7ac" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/husky b/vars/husky index a9a6f12d..e43c8a26 100644 --- a/vars/husky +++ b/vars/husky @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap4a.250105.002-factory-0b0ddde9.zip" -readonly image_sha256="0b0ddde9994194b36a6a98b9335d961bdb4d851777e83023de634ca1e11e3276" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap4a.250205.002-factory-7ae5fb2a.zip" +readonly image_sha256="7ae5fb2a932ad9d72de1337df48706aa3dab90f0d9ec8aa407b35a535abba13a" -readonly flash_url="https://flash.android.com/build/12701944?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap4a.250105.002-a9df99e8.zip" -readonly ota_sha256="a9df99e894b6cc17256a35a5c6dfb8a4c31978dda26c4d4b74fedfa46b5a6e92" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap4a.250205.002-039767c1.zip" +readonly ota_sha256="039767c183fd933a6b58b20f390856950f3d0ccbf8851f4ee82cb80681f4afa5" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/komodo b/vars/komodo index 359b56eb..5fd36b84 100644 --- a/vars/komodo +++ b/vars/komodo @@ -11,23 +11,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap4a.250105.002-factory-1f16cb17.zip" -readonly image_sha256="1f16cb17ce7221aa40dc9ddf3fb8d166257a4a69d8d3751e25528ab867516a67" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap4a.250205.002-factory-abcd406b.zip" +readonly image_sha256="abcd406b173a066466c54cfd64e0dc4e50cbc4a9cf602a3ea860d48e4f8088fa" -readonly flash_url="https://flash.android.com/build/12701944?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap4a.250105.002-41ab2eac.zip" -readonly ota_sha256="41ab2eacd26553a88d72a37295604f66eb8807b094d4cad043c482408c16bd38" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap4a.250205.002-e3270b8a.zip" +readonly ota_sha256="e3270b8afb184c4ff8e4e9ad8275bc48939f7da71549122e8244f4cf3d74dab8" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/lynx b/vars/lynx index 531e64a1..d9e409f0 100644 --- a/vars/lynx +++ b/vars/lynx @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap4a.250105.002-factory-9426ca16.zip" -readonly image_sha256="9426ca164b081aa3ed051a123a06a632004459a6913e59a58dacd06344442bae" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap4a.250205.002-factory-c4da467b.zip" +readonly image_sha256="c4da467b63935a586d7fd7670a6ef574c54412293350602e25af4f87c20e3b18" -readonly flash_url="https://flash.android.com/build/12701944?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap4a.250105.002-c8dc5836.zip" -readonly ota_sha256="c8dc58360421b0db748ecbc16352aed6d559a6c6cf49e31d5b50451f465c1b10" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap4a.250205.002-5537f895.zip" +readonly ota_sha256="5537f89555a70645908e0822c2962f6ec421646eb44c55639be751a35b6e2005" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/oriole b/vars/oriole index cf4d7ccf..30190612 100644 --- a/vars/oriole +++ b/vars/oriole @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap4a.250105.002-factory-242e9271.zip" -readonly image_sha256="242e92719154c8ee3bf906aecddae049798c28108e510cea0d6f011a804fcf7f" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap4a.250205.002-factory-4da65a28.zip" +readonly image_sha256="4da65a28d004300eb37ea3ec8a23939cc99759dc94e7aa8bd1ee24722131e1d5" -readonly flash_url="https://flash.android.com/build/12701944?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap4a.250105.002-5e0383a4.zip" -readonly ota_sha256="5e0383a4d1a3b6b788fbca7c1d52b7e93702969cbb640a474461ff1dd5165dfb" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap4a.250205.002-42f9942b.zip" +readonly ota_sha256="42f9942b363e7e26959edb64fec4919a70ceee57463b3af40c9ccc71b2beb24f" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/panther b/vars/panther index b5b78561..531b2ba0 100644 --- a/vars/panther +++ b/vars/panther @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap4a.250105.002-factory-19fbfb65.zip" -readonly image_sha256="19fbfb654a3c566cc993c12335d288af9e57161ceab2a00d0754ccaffe7450ee" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap4a.250205.002-factory-96459a57.zip" +readonly image_sha256="96459a5758e296747188d29d6e1f405cf925fd7cc9bd822a168f00a504d982bb" -readonly flash_url="https://flash.android.com/build/12701944?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap4a.250105.002-6e2a6418.zip" -readonly ota_sha256="6e2a641805f44df0f989deb0a87eb69de61d3e82648d3999185854d037f03ab3" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap4a.250205.002-f99cb92e.zip" +readonly ota_sha256="f99cb92efde3a0c2421a23f5594f2f4fa3a0805490f1f498396c33b2a157d9a1" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/raven b/vars/raven index 5de5ff6c..64f5301d 100644 --- a/vars/raven +++ b/vars/raven @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap4a.250105.002-factory-a6237d24.zip" -readonly image_sha256="a6237d24518841c6d60c1df36932ed31fda9ee55575bef1d1b59f52aeabb6a8a" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap4a.250205.002-factory-d8162d11.zip" +readonly image_sha256="d8162d11f9faa8f9b037a3b090d45ce8c0883e9eeac614c8daa0101b42ec3ea9" -readonly flash_url="https://flash.android.com/build/12701944?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap4a.250105.002-1653a739.zip" -readonly ota_sha256="1653a7393e55d9d7e85fa57d01a17267caee3e024e9a81f93aa907d7bcb521d9" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap4a.250205.002-186be29a.zip" +readonly ota_sha256="186be29a7b3ce00de3cf758e9363be17010f058577722dca404c6d313e7b4d53" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/shiba b/vars/shiba index 68cf92d0..4bc2d6c0 100644 --- a/vars/shiba +++ b/vars/shiba @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap4a.250105.002-factory-fe54edcd.zip" -readonly image_sha256="fe54edcd0607c29bec24b016655d99128f3597c98561f1d27efa61ecdb5a31a3" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap4a.250205.002-factory-71e85ee9.zip" +readonly image_sha256="71e85ee9a619fb5b481259f34c258992be58d897696bc2358b4ea1b4ca5a728d" -readonly flash_url="https://flash.android.com/build/12701944?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap4a.250105.002-8973f6e7.zip" -readonly ota_sha256="8973f6e79d0f3a371e5c342b15aa39f30d6f43cfa93d2bb5913d10247cda27f7" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap4a.250205.002-77464ab7.zip" +readonly ota_sha256="77464ab7b9c8722782a9939a0281c219c102c58c344ce98972cb63d8b947a89d" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/tangorpro b/vars/tangorpro index c45b839e..69c07145 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap4a.250105.002-factory-8c471fde.zip" -readonly image_sha256="8c471fde1ae795fdd264e4ba9bcb2b93e8a3aa88a8a38df0ad40b3cb4559424f" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap4a.250205.002-factory-fddb10ec.zip" +readonly image_sha256="fddb10ec5d7a66a608321cf98a9ac801c93ed6aef7caa19afb8e1c216289c40a" -readonly flash_url="https://flash.android.com/build/12701944?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap4a.250105.002-f0d8d5e9.zip" -readonly ota_sha256="f0d8d5e9f6d288e10c0b53ca4e6b978a223f965af73f5c6f6b00a19a130b7761" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap4a.250205.002-a877a020.zip" +readonly ota_sha256="a877a020252ef4e550de7647533258f591a3865ce5783ca0e47e07d34e2f4c4f" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" diff --git a/vars/tokay b/vars/tokay index 3001b605..45475240 100644 --- a/vars/tokay +++ b/vars/tokay @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250105.002" +readonly build_id="AP4A.250205.002" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr1-release" -readonly prev_aosp_tag="android-15.0.0_r6" -readonly aosp_tag="android-15.0.0_r10" +readonly prev_aosp_tag="android-15.0.0_r10" +readonly aosp_tag="android-15.0.0_r14" -readonly build_number="12701944" +readonly build_number="12821496" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap4a.250105.002-factory-d3f58a9f.zip" -readonly image_sha256="d3f58a9f93f634d8e73992a01df3ef5515fad7cef76b0f3fdb240439db279c45" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap4a.250205.002-factory-2c42ac34.zip" +readonly image_sha256="2c42ac341c0b80cb2e831d9704d079a1bc5240b7afea079c79a730e84573a42d" -readonly flash_url="https://flash.android.com/build/12701944?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/12821496?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap4a.250105.002-d60a3438.zip" -readonly ota_sha256="d60a34387c64b775bed0edda39c20c26138fb7881b8d00a88ae8f8617178acca" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap4a.250205.002-22cfd265.zip" +readonly ota_sha256="22cfd265760689253d1fad2166b443e7f02e64d713f90248df5eee328c2db07c" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" From b25c06284d93ea8ed2bbbccd8151a4dc6c4b16d8 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 3 Feb 2025 20:49:51 +0200 Subject: [PATCH 089/111] vars: Update fairphone builds Change-Id: Iff83e72ae2ed09bab24810623478135261a83193 --- vars/FP4 | 8 ++++---- vars/FP5 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vars/FP4 b/vars/FP4 index 4222f6ee..7fd129de 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP4.TP2N.C.0128" +readonly build_id="FP4.TP2P.C.0130" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2N-factory.zip" -readonly image_sha256="19320102d2d36cef2096e205ad85955da081510656329de34e2511d9c40ea832" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2P-factory.zip" +readonly image_sha256="a7dee94f3e3e2e42f3f41b12c682837dafe1ee34fc1aef08aa2b0a7753d985e2" -readonly security_patch="2024-11-05" +readonly security_patch="2025-01-05" diff --git a/vars/FP5 b/vars/FP5 index 9de7f938..e1dd363a 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.UT2H.B.088" +readonly build_id="FP5.UT2K.B.098" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2H-factory.zip" -readonly image_sha256="2da0b370f71121e858951c002ee86773537b6ea47de925700872699de99472b4" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2K-factory.zip" +readonly image_sha256="fa30bf3ab4862d2fb34c4df7bea9a07072df49fc5b93cdb503b5389fc86fafa2" -readonly security_patch="2024-11-05" +readonly security_patch="2025-01-05" From 9150bb836f360463dc5ac74aa52da87470f0c381 Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Fri, 27 Dec 2024 15:11:38 -0500 Subject: [PATCH 090/111] carriersettings-extractor: Always allow modifying APNs, take two Issue: calyxos#599 Issue: calyxos#636 Change-Id: Ided13fce71dbc1418e39dac3578c5f41e610c5f3 --- carriersettings-extractor/carriersettings_extractor.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/carriersettings-extractor/carriersettings_extractor.py b/carriersettings-extractor/carriersettings_extractor.py index 5ed37bb5..1b827679 100755 --- a/carriersettings-extractor/carriersettings_extractor.py +++ b/carriersettings-extractor/carriersettings_extractor.py @@ -62,10 +62,12 @@ def parse_args(): "smart_forwarding_config_component_name_string", "wfc_emergency_address_carrier_app_string", # Always allow editing APNs - "apn_expand_bool", "allow_adding_apns_bool", + "apn_expand_bool", + "hide_carrier_network_settings_bool", + "read_only_apn_fields_string_array", "read_only_apn_types_string_array", - "read_only_apn_fields_string_array"] + "show_apn_setting_cdma_bool"] threshold_configs = ["5g_nr_ssrsrp_thresholds_int_array", "5g_nr_sssinr_thresholds_int_array", @@ -311,7 +313,6 @@ def add_attributes(self): ) self.add_attribute('protocol') self.add_attribute('roaming_protocol') - self.add_attribute('carrier_enabled') self.add_attribute('bearer_bitmask') self.add_attribute('profile_id') self.add_attribute('modem_cognitive') @@ -332,8 +333,6 @@ def add_attributes(self): self.add_attribute('apn_set_id') # No source for integer carrier_id? self.add_attribute('skip_464xlat') - self.add_attribute('user_visible') - self.add_attribute('user_editable') if apns_folder is not None: with open(os.path.join(apns_folder, 'apns-conf.xml'), 'w', encoding='utf-8') as f: From 8c70a4dcb6c62e7bea0af47cc61553b2e8a48598 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 21 Feb 2025 23:25:16 +0530 Subject: [PATCH 091/111] factory: 6.4.0, 6.4.1 cd factory for d in *; do pushd $d; for f in *; do unzip /officialbuilds/6.4*/${d}-factory-*.zip */$f done mv */* . rmdir * popd done Change-Id: I2ec31074212e2d2ba3ee36f05adaaab7b114cc93 --- factory/FP4/flash-all.bat | 2 +- factory/FP4/flash-all.sh | 2 +- factory/FP5/flash-all.bat | 2 +- factory/FP5/flash-all.sh | 2 +- factory/akita/flash-all.bat | 10 +++++----- factory/akita/flash-all.sh | 10 +++++----- factory/akita/flash-base.sh | 8 ++++---- factory/barbet/flash-all.bat | 2 +- factory/barbet/flash-all.sh | 2 +- factory/bluejay/flash-all.bat | 10 +++++----- factory/bluejay/flash-all.sh | 10 +++++----- factory/bluejay/flash-base.sh | 8 ++++---- factory/bramble/flash-all.bat | 2 +- factory/bramble/flash-all.sh | 2 +- factory/cheetah/flash-all.bat | 10 +++++----- factory/cheetah/flash-all.sh | 10 +++++----- factory/cheetah/flash-base.sh | 8 ++++---- factory/devon/flash-all.bat | 2 +- factory/devon/flash-all.sh | 2 +- factory/felix/flash-all.bat | 10 +++++----- factory/felix/flash-all.sh | 10 +++++----- factory/felix/flash-base.sh | 8 ++++---- factory/hawao/flash-all.bat | 2 +- factory/hawao/flash-all.sh | 2 +- factory/husky/flash-all.bat | 10 +++++----- factory/husky/flash-all.sh | 10 +++++----- factory/husky/flash-base.sh | 8 ++++---- factory/lynx/flash-all.bat | 10 +++++----- factory/lynx/flash-all.sh | 10 +++++----- factory/lynx/flash-base.sh | 8 ++++---- factory/oriole/flash-all.bat | 10 +++++----- factory/oriole/flash-all.sh | 10 +++++----- factory/oriole/flash-base.sh | 8 ++++---- factory/panther/flash-all.bat | 10 +++++----- factory/panther/flash-all.sh | 10 +++++----- factory/panther/flash-base.sh | 8 ++++---- factory/raven/flash-all.bat | 10 +++++----- factory/raven/flash-all.sh | 10 +++++----- factory/raven/flash-base.sh | 8 ++++---- factory/redfin/flash-all.bat | 2 +- factory/redfin/flash-all.sh | 2 +- factory/rhode/flash-all.bat | 2 +- factory/rhode/flash-all.sh | 2 +- factory/shiba/flash-all.bat | 10 +++++----- factory/shiba/flash-all.sh | 10 +++++----- factory/shiba/flash-base.sh | 8 ++++---- factory/tangorpro/flash-all.bat | 6 +++--- factory/tangorpro/flash-all.sh | 6 +++--- factory/tangorpro/flash-base.sh | 4 ++-- 49 files changed, 164 insertions(+), 164 deletions(-) diff --git a/factory/FP4/flash-all.bat b/factory/FP4/flash-all.bat index 449f94b4..850f384e 100644 --- a/factory/FP4/flash-all.bat +++ b/factory/FP4/flash-all.bat @@ -71,7 +71,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-FP4-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-FP4-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/FP4/flash-all.sh b/factory/FP4/flash-all.sh index dd3794b0..8f58bf96 100755 --- a/factory/FP4/flash-all.sh +++ b/factory/FP4/flash-all.sh @@ -84,6 +84,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-FP4-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-FP4-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/FP5/flash-all.bat b/factory/FP5/flash-all.bat index 1f191f5a..5657ded8 100644 --- a/factory/FP5/flash-all.bat +++ b/factory/FP5/flash-all.bat @@ -73,7 +73,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-FP5-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-FP5-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/FP5/flash-all.sh b/factory/FP5/flash-all.sh index 4c7e68f7..c8a832ee 100755 --- a/factory/FP5/flash-all.sh +++ b/factory/FP5/flash-all.sh @@ -86,6 +86,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-FP5-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-FP5-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/akita/flash-all.bat b/factory/akita/flash-all.bat index 26e44ece..254a976c 100644 --- a/factory/akita/flash-all.bat +++ b/factory/akita/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: akita" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-akita-akita-15.1-12474670.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-akita-akita-15.1-12474670.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-akita-g5300o-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-akita-g5300o-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-akita-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-akita-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/akita/flash-all.sh b/factory/akita/flash-all.sh index 42655787..5b155069 100755 --- a/factory/akita/flash-all.sh +++ b/factory/akita/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: akita$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-akita-akita-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-akita-akita-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-akita-g5300o-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-akita-g5300o-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-akita-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-akita-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/akita/flash-base.sh b/factory/akita/flash-base.sh index c2233ff8..42688175 100755 --- a/factory/akita/flash-base.sh +++ b/factory/akita/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: akita$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-akita-akita-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-akita-akita-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-akita-akita-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-akita-g5300o-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-akita-g5300o-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-akita-g5300o-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/barbet/flash-all.bat b/factory/barbet/flash-all.bat index 2506cf47..c71adf2a 100644 --- a/factory/barbet/flash-all.bat +++ b/factory/barbet/flash-all.bat @@ -33,7 +33,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-barbet-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-barbet-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/barbet/flash-all.sh b/factory/barbet/flash-all.sh index a6b1499d..6a6407fd 100755 --- a/factory/barbet/flash-all.sh +++ b/factory/barbet/flash-all.sh @@ -46,6 +46,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-barbet-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-barbet-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/bluejay/flash-all.bat b/factory/bluejay/flash-all.bat index 70132b90..4aebd948 100644 --- a/factory/bluejay/flash-all.bat +++ b/factory/bluejay/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: bluejay" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-15.1-12292109.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-15.1-12292109.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img || exit /B 1 +fastboot flash --slot=other radio radio-bluejay-g5123b-143112-241107-B-12620021.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img || exit /B 1 +fastboot flash --slot=other radio radio-bluejay-g5123b-143112-241107-B-12620021.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-bluejay-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-bluejay-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/bluejay/flash-all.sh b/factory/bluejay/flash-all.sh index 0990b0b3..323f1a89 100755 --- a/factory/bluejay/flash-all.sh +++ b/factory/bluejay/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: bluejay$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-bluejay-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-bluejay-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bluejay-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-bluejay-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/bluejay/flash-base.sh b/factory/bluejay/flash-base.sh index 27ede601..281d6b19 100755 --- a/factory/bluejay/flash-base.sh +++ b/factory/bluejay/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: bluejay$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-bluejay-bluejay-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-bluejay-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-bluejay-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-bluejay-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/bramble/flash-all.bat b/factory/bramble/flash-all.bat index 470130e1..640a9410 100644 --- a/factory/bramble/flash-all.bat +++ b/factory/bramble/flash-all.bat @@ -33,7 +33,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-bramble-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-bramble-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/bramble/flash-all.sh b/factory/bramble/flash-all.sh index 2ddcfdb8..7c384e8e 100755 --- a/factory/bramble/flash-all.sh +++ b/factory/bramble/flash-all.sh @@ -46,6 +46,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-bramble-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-bramble-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/cheetah/flash-all.bat b/factory/cheetah/flash-all.bat index 92c424fa..aca4b655 100644 --- a/factory/cheetah/flash-all.bat +++ b/factory/cheetah/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: cheetah" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-cheetah-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-cheetah-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-cheetah-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-cheetah-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/cheetah/flash-all.sh b/factory/cheetah/flash-all.sh index aeb6ec04..e9e178c4 100755 --- a/factory/cheetah/flash-all.sh +++ b/factory/cheetah/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: cheetah$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-cheetah-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-cheetah-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/cheetah/flash-base.sh b/factory/cheetah/flash-base.sh index 01cc390a..8e5045d0 100755 --- a/factory/cheetah/flash-base.sh +++ b/factory/cheetah/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: cheetah$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-cheetah-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-cheetah-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-cheetah-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/devon/flash-all.bat b/factory/devon/flash-all.bat index e87e8500..314f0ee0 100644 --- a/factory/devon/flash-all.bat +++ b/factory/devon/flash-all.bat @@ -68,7 +68,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-devon-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-devon-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/devon/flash-all.sh b/factory/devon/flash-all.sh index 901ba873..1811a5e5 100755 --- a/factory/devon/flash-all.sh +++ b/factory/devon/flash-all.sh @@ -81,6 +81,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-devon-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-devon-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/felix/flash-all.bat b/factory/felix/flash-all.bat index 7df3cbf6..adb09f1b 100644 --- a/factory/felix/flash-all.bat +++ b/factory/felix/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: felix" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-felix-felix-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-felix-felix-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-felix-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-felix-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-felix-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-felix-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/felix/flash-all.sh b/factory/felix/flash-all.sh index 5885f1bd..4aae11a5 100755 --- a/factory/felix/flash-all.sh +++ b/factory/felix/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: felix$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-felix-felix-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-felix-felix-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-felix-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-felix-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-felix-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-felix-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/felix/flash-base.sh b/factory/felix/flash-base.sh index 240f728a..8de45e87 100755 --- a/factory/felix/flash-base.sh +++ b/factory/felix/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: felix$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-felix-felix-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-felix-felix-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-felix-felix-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-felix-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-felix-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-felix-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/hawao/flash-all.bat b/factory/hawao/flash-all.bat index 088893f0..43a51b14 100644 --- a/factory/hawao/flash-all.bat +++ b/factory/hawao/flash-all.bat @@ -68,7 +68,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-hawao-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-hawao-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/hawao/flash-all.sh b/factory/hawao/flash-all.sh index 2f6e3681..abf6de9c 100755 --- a/factory/hawao/flash-all.sh +++ b/factory/hawao/flash-all.sh @@ -81,6 +81,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-hawao-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-hawao-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/husky/flash-all.bat b/factory/husky/flash-all.bat index 45c21e01..4421b9c6 100644 --- a/factory/husky/flash-all.bat +++ b/factory/husky/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: husky" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-15.1-12474670.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-15.1-12474670.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-husky-g5300i-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-husky-g5300i-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-husky-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-husky-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/husky/flash-all.sh b/factory/husky/flash-all.sh index dabbf310..daa6ad74 100755 --- a/factory/husky/flash-all.sh +++ b/factory/husky/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: husky$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-husky-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-husky-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-husky-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-husky-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/husky/flash-base.sh b/factory/husky/flash-base.sh index 6b6db15d..7d0a3b5d 100755 --- a/factory/husky/flash-base.sh +++ b/factory/husky/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: husky$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-husky-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-husky-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-husky-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-husky-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/lynx/flash-all.bat b/factory/lynx/flash-all.bat index 4ea91730..afa4067f 100644 --- a/factory/lynx/flash-all.bat +++ b/factory/lynx/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: lynx" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-lynx-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-lynx-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-lynx-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-lynx-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/lynx/flash-all.sh b/factory/lynx/flash-all.sh index 86388f34..65a296b0 100755 --- a/factory/lynx/flash-all.sh +++ b/factory/lynx/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: lynx$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-lynx-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-lynx-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-lynx-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-lynx-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/lynx/flash-base.sh b/factory/lynx/flash-base.sh index 2ec686a7..7b45a5b4 100755 --- a/factory/lynx/flash-base.sh +++ b/factory/lynx/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: lynx$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-lynx-lynx-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-lynx-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-lynx-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-lynx-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/oriole/flash-all.bat b/factory/oriole/flash-all.bat index cb7006e7..2f0e309a 100644 --- a/factory/oriole/flash-all.bat +++ b/factory/oriole/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: oriole" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-oriole-slider-15.1-12292109.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-oriole-slider-15.1-12292109.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img || exit /B 1 +fastboot flash --slot=other radio radio-oriole-g5123b-143112-241107-B-12620021.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img || exit /B 1 +fastboot flash --slot=other radio radio-oriole-g5123b-143112-241107-B-12620021.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-oriole-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-oriole-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/oriole/flash-all.sh b/factory/oriole/flash-all.sh index d6fda475..09fc0edf 100755 --- a/factory/oriole/flash-all.sh +++ b/factory/oriole/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: oriole$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-oriole-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-oriole-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-oriole-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-oriole-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/oriole/flash-base.sh b/factory/oriole/flash-base.sh index 72a87c13..fae448fe 100755 --- a/factory/oriole/flash-base.sh +++ b/factory/oriole/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: oriole$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-oriole-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-oriole-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-oriole-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-oriole-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-oriole-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/panther/flash-all.bat b/factory/panther/flash-all.bat index 8f7ad5a3..03b6f76d 100644 --- a/factory/panther/flash-all.bat +++ b/factory/panther/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: panther" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-panther-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-panther-g5300q-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-panther-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-panther-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/panther/flash-all.sh b/factory/panther/flash-all.sh index 2efb0ada..a250a66a 100755 --- a/factory/panther/flash-all.sh +++ b/factory/panther/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: panther$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-panther-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-panther-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-panther-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-panther-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/panther/flash-base.sh b/factory/panther/flash-base.sh index 64c27301..7b7d2b41 100755 --- a/factory/panther/flash-base.sh +++ b/factory/panther/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: panther$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-panther-cloudripper-14.5-11677884.img +fastboot flash --slot=other bootloader bootloader-panther-cloudripper-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-panther-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-panther-g5300q-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-panther-g5300q-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/raven/flash-all.bat b/factory/raven/flash-all.bat index a0ee0750..e466d574 100644 --- a/factory/raven/flash-all.bat +++ b/factory/raven/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: raven" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-raven-slider-15.1-12292109.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-raven-slider-15.1-12292109.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img || exit /B 1 +fastboot flash --slot=other radio radio-raven-g5123b-143112-241107-B-12620021.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img || exit /B 1 +fastboot flash --slot=other radio radio-raven-g5123b-143112-241107-B-12620021.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-raven-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-raven-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/raven/flash-all.sh b/factory/raven/flash-all.sh index f840c76c..0d441545 100755 --- a/factory/raven/flash-all.sh +++ b/factory/raven/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: raven$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-raven-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-raven-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-raven-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-raven-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-raven-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-raven-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/raven/flash-base.sh b/factory/raven/flash-base.sh index 086120cd..20011d29 100755 --- a/factory/raven/flash-base.sh +++ b/factory/raven/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: raven$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-raven-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-raven-slider-14.5-11677881.img +fastboot flash --slot=other bootloader bootloader-raven-slider-15.1-12292109.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-raven-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-raven-g5123b-135085-240517-B-11857288.img +fastboot flash --slot=other radio radio-raven-g5123b-143112-241107-B-12620021.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/redfin/flash-all.bat b/factory/redfin/flash-all.bat index b74ba358..6d9c51a6 100644 --- a/factory/redfin/flash-all.bat +++ b/factory/redfin/flash-all.bat @@ -33,7 +33,7 @@ fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-redfin-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-redfin-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/redfin/flash-all.sh b/factory/redfin/flash-all.sh index 9fb482ce..3422df59 100755 --- a/factory/redfin/flash-all.sh +++ b/factory/redfin/flash-all.sh @@ -46,6 +46,6 @@ fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-redfin-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-redfin-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/rhode/flash-all.bat b/factory/rhode/flash-all.bat index 8101d213..e1fe7905 100644 --- a/factory/rhode/flash-all.bat +++ b/factory/rhode/flash-all.bat @@ -68,7 +68,7 @@ fastboot --set-active=a reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-rhode-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-rhode-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/rhode/flash-all.sh b/factory/rhode/flash-all.sh index 7e1cc815..20e46a78 100755 --- a/factory/rhode/flash-all.sh +++ b/factory/rhode/flash-all.sh @@ -81,6 +81,6 @@ fastboot --set-active=a reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-rhode-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-rhode-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/shiba/flash-all.bat b/factory/shiba/flash-all.bat index f65f9bca..0dafe0af 100644 --- a/factory/shiba/flash-all.bat +++ b/factory/shiba/flash-all.bat @@ -19,21 +19,21 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: shiba" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-15.1-12474670.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-15.1-12474670.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-shiba-g5300i-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img || exit /B 1 +fastboot flash --slot=other radio radio-shiba-g5300i-240919-241106-B-12612898.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-shiba-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-shiba-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/shiba/flash-all.sh b/factory/shiba/flash-all.sh index fba73647..5335163f 100755 --- a/factory/shiba/flash-all.sh +++ b/factory/shiba/flash-all.sh @@ -32,20 +32,20 @@ if ! fastboot getvar product 2>&1 | grep "^product: shiba$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-shiba-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-shiba-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-shiba-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-shiba-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/shiba/flash-base.sh b/factory/shiba/flash-base.sh index 525a974e..93b9f472 100755 --- a/factory/shiba/flash-base.sh +++ b/factory/shiba/flash-base.sh @@ -32,16 +32,16 @@ if ! fastboot getvar product 2>&1 | grep "^product: shiba$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-14.5-11693900.img +fastboot flash --slot=other bootloader bootloader-shiba-ripcurrent-15.1-12474670.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-shiba-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other radio radio-shiba-g5300i-240308-240517-B-11857457.img +fastboot flash --slot=other radio radio-shiba-g5300i-240919-241106-B-12612898.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key diff --git a/factory/tangorpro/flash-all.bat b/factory/tangorpro/flash-all.bat index 406a3eac..8ce7acc5 100644 --- a/factory/tangorpro/flash-all.bat +++ b/factory/tangorpro/flash-all.bat @@ -19,15 +19,15 @@ if not %ERRORLEVEL%==1 if "%DEVICE_FLASHER_VERSION%"=="" exit /B 1 PATH=%PATH%;"%SYSTEMROOT%\System32" fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || echo "Factory image and device do not match. Please double check" fastboot getvar product 2>&1 | findstr /r /c:"^product: tangorpro" || exit /B 1 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img || exit /B 1 +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-15.1-12292122.img || exit /B 1 fastboot --set-active=other reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul fastboot erase avb_custom_key || exit /B 1 fastboot flash avb_custom_key avb_custom_key.img || exit /B 1 -fastboot --skip-reboot -w update image-tangorpro-ap2a.240605.024.zip || exit /B 1 +fastboot --skip-reboot -w update image-tangorpro-ap4a.250205.002.zip || exit /B 1 fastboot reboot-bootloader || exit /B 1 ping -n 5 127.0.0.1 >nul diff --git a/factory/tangorpro/flash-all.sh b/factory/tangorpro/flash-all.sh index 150677e5..8ce014da 100755 --- a/factory/tangorpro/flash-all.sh +++ b/factory/tangorpro/flash-all.sh @@ -32,14 +32,14 @@ if ! fastboot getvar product 2>&1 | grep "^product: tangorpro$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key fastboot flash avb_custom_key avb_custom_key.img -fastboot --skip-reboot -w update image-tangorpro-ap2a.240605.024.zip +fastboot --skip-reboot -w update image-tangorpro-ap4a.250205.002.zip fastboot reboot-bootloader sleep 5 diff --git a/factory/tangorpro/flash-base.sh b/factory/tangorpro/flash-base.sh index bdbd58e7..cbc8ea0a 100755 --- a/factory/tangorpro/flash-base.sh +++ b/factory/tangorpro/flash-base.sh @@ -32,10 +32,10 @@ if ! fastboot getvar product 2>&1 | grep "^product: tangorpro$"; then echo "Factory image and device do not match. Please double check" exit 1 fi -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 -fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-14.5-11707788.img +fastboot flash --slot=other bootloader bootloader-tangorpro-tangorpro-15.1-12292122.img fastboot --set-active=other reboot-bootloader sleep 5 fastboot erase avb_custom_key From b3674032143304d137fe9d9404c6d84eb7d78bbb Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 5 Mar 2025 02:30:59 +0530 Subject: [PATCH 092/111] git-review: 15-qpr2 Change-Id: I5b2ebf897371889b9fc81cbb127d06643da4a7dd --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 18f6a98a..81db4bdc 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.calyxos.org port=29418 project=CalyxOS/scripts -defaultbranch=android15-qpr1 +defaultbranch=android15-qpr2 From 11dc2ad19279b9a5b83d97917f9a7bb9983f96b4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 5 Mar 2025 01:16:23 +0530 Subject: [PATCH 093/111] March 2025 Security update and Quarterly Platform Release Change-Id: I98c4247d01f963aca87de9c962dc50fd09a0387a --- vars/akita | 22 +++++++++++----------- vars/aosp_target_release | 2 +- vars/bluejay | 22 +++++++++++----------- vars/caiman | 22 +++++++++++----------- vars/cheetah | 22 +++++++++++----------- vars/comet | 22 +++++++++++----------- vars/common | 18 +++++++++--------- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/komodo | 22 +++++++++++----------- vars/lynx | 22 +++++++++++----------- vars/oriole | 22 +++++++++++----------- vars/panther | 22 +++++++++++----------- vars/raven | 22 +++++++++++----------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 22 +++++++++++----------- vars/tokay | 22 +++++++++++----------- 17 files changed, 175 insertions(+), 175 deletions(-) diff --git a/vars/akita b/vars/akita index 34d6a3ab..e610a23b 100644 --- a/vars/akita +++ b/vars/akita @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-ap4a.250205.002-factory-0da0522c.zip" -readonly image_sha256="0da0522c4ed8d2c18578dc5a27e4efa65c4594b4157d4db34ccc20992bcd5019" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-bp1a.250305.019-factory-33ce5db3.zip" +readonly image_sha256="33ce5db3f98b64d482cfb23b70a1877c928f88188d669aadccb71c0ae1178f7c" -readonly flash_url="https://flash.android.com/build/12821496?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-ap4a.250205.002-7de23674.zip" -readonly ota_sha256="7de23674cbb43bdb748f346796b5d8a21ec5cf82dcc3de8a35020566bc330de3" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-bp1a.250305.019-04de80f4.zip" +readonly ota_sha256="04de80f4002ed32d73e57c717f3e2d7282d4560d37690243284cbb3bd0bd3208" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/aosp_target_release b/vars/aosp_target_release index 53601ef3..bba48b44 100644 --- a/vars/aosp_target_release +++ b/vars/aosp_target_release @@ -1,2 +1,2 @@ # Updated manually -aosp_target_release=ap4a +aosp_target_release=bp1a diff --git a/vars/bluejay b/vars/bluejay index 7c3ef56d..4e4b3b24 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap4a.250205.002-factory-6e330d72.zip" -readonly image_sha256="6e330d725784defb188a58a5cfa31ba4720457d89c7c77ce2cc261b9bdeb0145" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-bp1a.250305.019-factory-9dde1d1d.zip" +readonly image_sha256="9dde1d1d05778041f5cc439e01b73f2c7e9c8837d1d9192e4db1c435e27be169" -readonly flash_url="https://flash.android.com/build/12821496?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap4a.250205.002-0050fec3.zip" -readonly ota_sha256="0050fec36449d663e487a2169c81b23670b775020adb7d93a30789fc3ca6ddea" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-bp1a.250305.019-4204a881.zip" +readonly ota_sha256="4204a8816afc7503df7ec1d461c4303bb6d4f6b9089a0d22c3309874a8efebdc" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/caiman b/vars/caiman index 0d509708..a4a69a95 100644 --- a/vars/caiman +++ b/vars/caiman @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.020" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r21" -readonly build_number="12821496" +readonly build_number="13009785" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-ap4a.250205.002-factory-651a08f8.zip" -readonly image_sha256="651a08f8b932fbc635eac80a0132506333fbffd6d369c5fb81a8edb7d51e8814" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-bp1a.250305.020-factory-8ece3008.zip" +readonly image_sha256="8ece3008a79be804415daaee2e2e311662518de9f07f16bed8f56030351bdfdf" -readonly flash_url="https://flash.android.com/build/12821496?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/13009785?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-ap4a.250205.002-2e8a8511.zip" -readonly ota_sha256="2e8a851108d2567be61f6252f76c9d1f38a516cea4fe0066d10764eecc803d96" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-bp1a.250305.020-d387782c.zip" +readonly ota_sha256="d387782c7a8e8d1663cc1f8c4b03b88ff00b6fff0aea9456a8eb66f628e631eb" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/cheetah b/vars/cheetah index f93799df..721f5e42 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap4a.250205.002-factory-6a87c591.zip" -readonly image_sha256="6a87c591a5d6811a3b102a440743cbad8fdc10e553cd4df8906dccc6980afc7c" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-bp1a.250305.019-factory-22c3c6de.zip" +readonly image_sha256="22c3c6de8d2726a0e0be5eaa66fb753e9e4cd07ddaee9f1e322599053caa36d2" -readonly flash_url="https://flash.android.com/build/12821496?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap4a.250205.002-259bb787.zip" -readonly ota_sha256="259bb787fd9f7daec276293ef1fc69948e5a9180161a4fab25d567d209717c29" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-bp1a.250305.019-9ab4e432.zip" +readonly ota_sha256="9ab4e432abec5e6c8e279c39034a508855dcad397e1ee310fbdf0dc16d564e3d" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/comet b/vars/comet index 1bc89586..35df94da 100644 --- a/vars/comet +++ b/vars/comet @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.020" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r21" -readonly build_number="12821496" +readonly build_number="13009785" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-ap4a.250205.002-factory-911704e4.zip" -readonly image_sha256="911704e4f7d56343b6211046d89e5f421f62cc8c7cc1fb071f07137965cf3d46" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-bp1a.250305.020-factory-3266bb9f.zip" +readonly image_sha256="3266bb9fc4b59d1d4d9b1a6746fb0b5985b2e80d64b005f36b49e4156ed90414" -readonly flash_url="https://flash.android.com/build/12821496?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/13009785?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-ap4a.250205.002-5b998617.zip" -readonly ota_sha256="5b998617ac3dc94ed3951b4ff8bb0cbf5e12e9381e559abc2f185d1588db499d" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-bp1a.250305.020-04e1162a.zip" +readonly ota_sha256="04e1162afd6c7ae41b5e09bb0697b78bf28858766f6d19ad17cfc9ffab9dafaa" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/common b/vars/common index 128d571d..5ab76dca 100644 --- a/vars/common +++ b/vars/common @@ -2,19 +2,19 @@ readonly android_version=15 # For build-desc-fingerprint.sh readonly aosp_tag_match=android-15.0 # For update-device-vars.sh -readonly os_branch=android15-qpr1 -readonly device_branch=android15-qpr1 +readonly os_branch=android15-qpr2 +readonly device_branch=android15-qpr2 -readonly common_aosp_branch=android15-qpr1-release # Feb 2025 +readonly common_aosp_branch=android15-qpr2-release # Mar 2025 -readonly prev_common_aosp_tag=android-15.0.0_r10 # Jan 2025, Pixel 6-9 -readonly common_aosp_tag=android-15.0.0_r14 # Feb 2025, Pixel 6-9 +readonly prev_common_aosp_tag=android-15.0.0_r14 # Feb 2025, Pixel 6-9 +readonly common_aosp_tag=android-15.0.0_r20 # Mar 2025, Pixel 6-8 -readonly common_aosp_build_id=AP4A.250205.002 # Feb 2025, Pixel 6-9 +readonly common_aosp_build_id=BP1A.250305.019 # Mar 2025, Pixel 6-8 -readonly topic=feb25 +readonly topic=mar25 -readonly lineageos_branch=lineage-22.1 -readonly lineageos_device_branch=lineage-22.1 +readonly lineageos_branch=lineage-22.2 +readonly lineageos_device_branch=lineage-22.2 readonly merge_method="merge" diff --git a/vars/felix b/vars/felix index b3eda92a..ccb98d80 100644 --- a/vars/felix +++ b/vars/felix @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap4a.250205.002-factory-a1bcd5a5.zip" -readonly image_sha256="a1bcd5a54f8a4d8932d212a1b0e42fcdb580a236d738c808f37f442efd79a463" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-bp1a.250305.019-factory-45f5bf57.zip" +readonly image_sha256="45f5bf57224f2efab8b212429f5724a6129a45e0fc317b154556bd564b4edc91" -readonly flash_url="https://flash.android.com/build/12821496?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap4a.250205.002-e82e1aab.zip" -readonly ota_sha256="e82e1aab01ce5d706b8f949dd992c160067f600c7e1435bf697304ef70a0b7ac" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-bp1a.250305.019-d192005d.zip" +readonly ota_sha256="d192005dd50d1b8cd4e5fe1a8cf5b13fc2a615aa0009747f3eab5a67a81a5fc2" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/husky b/vars/husky index e43c8a26..7bdc1839 100644 --- a/vars/husky +++ b/vars/husky @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap4a.250205.002-factory-7ae5fb2a.zip" -readonly image_sha256="7ae5fb2a932ad9d72de1337df48706aa3dab90f0d9ec8aa407b35a535abba13a" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-bp1a.250305.019-factory-426dde3f.zip" +readonly image_sha256="426dde3fbfb497fa5320c2d43e0f219dc778b2a5f9bd5d1080efc6ec7ce831df" -readonly flash_url="https://flash.android.com/build/12821496?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap4a.250205.002-039767c1.zip" -readonly ota_sha256="039767c183fd933a6b58b20f390856950f3d0ccbf8851f4ee82cb80681f4afa5" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-bp1a.250305.019-b4977f37.zip" +readonly ota_sha256="b4977f37cd8e58d791aecfe28fa8018c9688ae3d0cd7871c5ff37b0ff27368cc" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/komodo b/vars/komodo index 5fd36b84..0ee7fe0e 100644 --- a/vars/komodo +++ b/vars/komodo @@ -11,23 +11,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.020" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r21" -readonly build_number="12821496" +readonly build_number="13009785" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-ap4a.250205.002-factory-abcd406b.zip" -readonly image_sha256="abcd406b173a066466c54cfd64e0dc4e50cbc4a9cf602a3ea860d48e4f8088fa" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-bp1a.250305.020-factory-43dd7f7c.zip" +readonly image_sha256="43dd7f7c1024945ff4ff251b7b6959a0cb43076db356712dabbd14a48ba2e72b" -readonly flash_url="https://flash.android.com/build/12821496?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/13009785?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-ap4a.250205.002-e3270b8a.zip" -readonly ota_sha256="e3270b8afb184c4ff8e4e9ad8275bc48939f7da71549122e8244f4cf3d74dab8" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-bp1a.250305.020-20c1d368.zip" +readonly ota_sha256="20c1d36846fa1d7e7df6e2566baceadb88f4430ec3b230ef13236fbd7d256b91" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/lynx b/vars/lynx index d9e409f0..c498b4e7 100644 --- a/vars/lynx +++ b/vars/lynx @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap4a.250205.002-factory-c4da467b.zip" -readonly image_sha256="c4da467b63935a586d7fd7670a6ef574c54412293350602e25af4f87c20e3b18" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-bp1a.250305.019-factory-06015c27.zip" +readonly image_sha256="06015c27d6368a48249fd423bca104564fe1d0de6c721213e76b282c19cac6e9" -readonly flash_url="https://flash.android.com/build/12821496?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap4a.250205.002-5537f895.zip" -readonly ota_sha256="5537f89555a70645908e0822c2962f6ec421646eb44c55639be751a35b6e2005" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-bp1a.250305.019-36e763c0.zip" +readonly ota_sha256="36e763c070fd69a75df099c88321c7968c167ec3b73542176db76c61c4585852" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/oriole b/vars/oriole index 30190612..e2b47105 100644 --- a/vars/oriole +++ b/vars/oriole @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap4a.250205.002-factory-4da65a28.zip" -readonly image_sha256="4da65a28d004300eb37ea3ec8a23939cc99759dc94e7aa8bd1ee24722131e1d5" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-bp1a.250305.019-factory-9015126c.zip" +readonly image_sha256="9015126cd05c898aecd24d2c2a97e1f7bbb1a5a9f6505b157fa63728115ab72d" -readonly flash_url="https://flash.android.com/build/12821496?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap4a.250205.002-42f9942b.zip" -readonly ota_sha256="42f9942b363e7e26959edb64fec4919a70ceee57463b3af40c9ccc71b2beb24f" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-bp1a.250305.019-34e04bed.zip" +readonly ota_sha256="34e04bed74a71493ea8d30737d972278464cad36a5dc6761bf2723fc25969196" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/panther b/vars/panther index 531b2ba0..9b677345 100644 --- a/vars/panther +++ b/vars/panther @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap4a.250205.002-factory-96459a57.zip" -readonly image_sha256="96459a5758e296747188d29d6e1f405cf925fd7cc9bd822a168f00a504d982bb" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-bp1a.250305.019-factory-3cc92367.zip" +readonly image_sha256="3cc92367035891fa3a5faec83238dc450738502df12c9e8d4d681b5bb7c5e943" -readonly flash_url="https://flash.android.com/build/12821496?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap4a.250205.002-f99cb92e.zip" -readonly ota_sha256="f99cb92efde3a0c2421a23f5594f2f4fa3a0805490f1f498396c33b2a157d9a1" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-bp1a.250305.019-a16052a5.zip" +readonly ota_sha256="a16052a5a86d6ee2b54ab63c9dab7555f43e8e943b111d3656b02dfa3cb368e0" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/raven b/vars/raven index 64f5301d..b05e0b6d 100644 --- a/vars/raven +++ b/vars/raven @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap4a.250205.002-factory-d8162d11.zip" -readonly image_sha256="d8162d11f9faa8f9b037a3b090d45ce8c0883e9eeac614c8daa0101b42ec3ea9" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-bp1a.250305.019-factory-6bccc073.zip" +readonly image_sha256="6bccc073b56d02cc0ce465aa927a3da612ee86d7b23f7b620b95f5b89bef4071" -readonly flash_url="https://flash.android.com/build/12821496?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap4a.250205.002-186be29a.zip" -readonly ota_sha256="186be29a7b3ce00de3cf758e9363be17010f058577722dca404c6d313e7b4d53" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-bp1a.250305.019-2c923d08.zip" +readonly ota_sha256="2c923d08026d4a37bc76ebf3c184d84028204216c328ff907fbf9b4ff2c0d712" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/shiba b/vars/shiba index 4bc2d6c0..6c98e5c8 100644 --- a/vars/shiba +++ b/vars/shiba @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.019" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r20" -readonly build_number="12821496" +readonly build_number="13003188" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap4a.250205.002-factory-71e85ee9.zip" -readonly image_sha256="71e85ee9a619fb5b481259f34c258992be58d897696bc2358b4ea1b4ca5a728d" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-bp1a.250305.019-factory-4401ad97.zip" +readonly image_sha256="4401ad979ea4f5dbfabb51cd865df1dfae90a23ef4943a281d3f749002308117" -readonly flash_url="https://flash.android.com/build/12821496?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/13003188?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap4a.250205.002-77464ab7.zip" -readonly ota_sha256="77464ab7b9c8722782a9939a0281c219c102c58c344ce98972cb63d8b947a89d" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-bp1a.250305.019-1f4e6c4d.zip" +readonly ota_sha256="1f4e6c4da9ee3419d8547848a13021badad86a7f249fb5a0983df04b47fe92ae" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/tangorpro b/vars/tangorpro index 69c07145..b7a1c651 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.020.T2" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r23" -readonly build_number="12821496" +readonly build_number="13023825" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap4a.250205.002-factory-fddb10ec.zip" -readonly image_sha256="fddb10ec5d7a66a608321cf98a9ac801c93ed6aef7caa19afb8e1c216289c40a" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-bp1a.250305.020.t2-factory-908d0b5d.zip" +readonly image_sha256="908d0b5d6310577999039f1c9ff6e4eb28bc44084d9a948a5c741fdd77313ed7" -readonly flash_url="https://flash.android.com/build/12821496?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/13023825?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap4a.250205.002-a877a020.zip" -readonly ota_sha256="a877a020252ef4e550de7647533258f591a3865ce5783ca0e47e07d34e2f4c4f" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-bp1a.250305.020.t2-da00f6f9.zip" +readonly ota_sha256="da00f6f91942ec878fb102af3fc033491109cf9856bbfb50f8f9436dfb45378d" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" diff --git a/vars/tokay b/vars/tokay index 45475240..8964b781 100644 --- a/vars/tokay +++ b/vars/tokay @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="AP4A.250205.002" +readonly build_id="BP1A.250305.020" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr1-release" +readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r10" -readonly aosp_tag="android-15.0.0_r14" +readonly prev_aosp_tag="android-15.0.0_r14" +readonly aosp_tag="android-15.0.0_r21" -readonly build_number="12821496" +readonly build_number="13009785" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-ap4a.250205.002-factory-2c42ac34.zip" -readonly image_sha256="2c42ac341c0b80cb2e831d9704d079a1bc5240b7afea079c79a730e84573a42d" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-bp1a.250305.020-factory-b62074e2.zip" +readonly image_sha256="b62074e2bc6b9c95f360a8519498ddd22e5fd79df784e0ba50fc81334a79204d" -readonly flash_url="https://flash.android.com/build/12821496?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/13009785?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-ap4a.250205.002-22cfd265.zip" -readonly ota_sha256="22cfd265760689253d1fad2166b443e7f02e64d713f90248df5eee328c2db07c" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-bp1a.250305.020-b9e71d08.zip" +readonly ota_sha256="b9e71d0833afee1b5b8ff84dbce4d335376925b9db6c4c8e1b1d29b447c2e4a7" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" From 002ab63dcdb7569e4fb41770e36b1f1317c4e948 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 27 Mar 2025 17:34:19 +0200 Subject: [PATCH 094/111] vars: Pixel 9 update Change-Id: Ib4b410fe691dcef2f4138b67e2b46413e7cb6ed6 --- vars/common | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/common b/vars/common index 5ab76dca..9de1fd96 100644 --- a/vars/common +++ b/vars/common @@ -7,10 +7,10 @@ readonly device_branch=android15-qpr2 readonly common_aosp_branch=android15-qpr2-release # Mar 2025 -readonly prev_common_aosp_tag=android-15.0.0_r14 # Feb 2025, Pixel 6-9 -readonly common_aosp_tag=android-15.0.0_r20 # Mar 2025, Pixel 6-8 +readonly prev_common_aosp_tag=android-15.0.0_r20 # Mar 2025, Pixel 6-8 +readonly common_aosp_tag=android-15.0.0_r21 # Mar 2025, Pixel 9 -readonly common_aosp_build_id=BP1A.250305.019 # Mar 2025, Pixel 6-8 +readonly common_aosp_build_id=BP1A.250305.020 # Mar 2025, Pixel 9 readonly topic=mar25 From 145ea44b77f6b969dc0f6ec702889647e746a7f9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 27 Mar 2025 17:39:38 +0200 Subject: [PATCH 095/111] vars: Pixel Tablet update Change-Id: Ie54ba2d90c9da7afa38aa2e9e33ed55bffbebf40 --- vars/common | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/common b/vars/common index 9de1fd96..b32bc373 100644 --- a/vars/common +++ b/vars/common @@ -7,10 +7,10 @@ readonly device_branch=android15-qpr2 readonly common_aosp_branch=android15-qpr2-release # Mar 2025 -readonly prev_common_aosp_tag=android-15.0.0_r20 # Mar 2025, Pixel 6-8 -readonly common_aosp_tag=android-15.0.0_r21 # Mar 2025, Pixel 9 +readonly prev_common_aosp_tag=android-15.0.0_r21 # Mar 2025, Pixel 9 +readonly common_aosp_tag=android-15.0.0_r23 # Mar 2025, Pixel Tablet -readonly common_aosp_build_id=BP1A.250305.020 # Mar 2025, Pixel 9 +readonly common_aosp_build_id=BP1A.250305.020.T2 # Mar 2025, Pixel Tablet readonly topic=mar25 From 9518d12243c57964687458bdbf3e95d19bc128ac Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 21 Feb 2025 01:39:37 +0200 Subject: [PATCH 096/111] Reapply "aosp-merger: Check if branch exists before abandoning" This reverts commit f6b1f7c65ccec8bc7cec4f44d9a5fe3392c569af. Fixed the code to check the exit code of git show-ref instead of its output. Change-Id: I0cd216920771daf39f9115864da249a640b4de8a --- aosp-merger/_merge_helper.sh | 4 +++- aosp-merger/_subtree_merge_helper.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index cb5252b8..ea488444 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -73,7 +73,9 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" cd "${TOP}/${PROJECTPATH}" # Ditch any existing staging branches -repo abandon "${STAGINGBRANCH}" . +if git show-ref --verify --quiet refs/heads/"${STAGINGBRANCH}"; then + repo abandon "${STAGINGBRANCH}" . +fi repo start "${STAGINGBRANCH}" . if [ -f ".gitupstream-lineage" ] && [ "${LINEAGE}" = true ]; then if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then diff --git a/aosp-merger/_subtree_merge_helper.sh b/aosp-merger/_subtree_merge_helper.sh index 99369c5a..a932384c 100755 --- a/aosp-merger/_subtree_merge_helper.sh +++ b/aosp-merger/_subtree_merge_helper.sh @@ -68,7 +68,9 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}" cd "${TOP}/${PROJECTPATH}" # Ditch any existing staging branches -repo abandon "${STAGINGBRANCH}" . +if git show-ref --verify --quiet refs/heads/"${STAGINGBRANCH}"; then + repo abandon "${STAGINGBRANCH}" . +fi repo start "${STAGINGBRANCH}" . if [ -f ".gitupstream" ]; then git fetch -q --force --tags "$(cat .gitupstream)" "${NEWTAG}" From 5a77eca65f3f14a13186f030e497c149af87680b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 14 Mar 2025 03:12:07 +0200 Subject: [PATCH 097/111] vars: Update to latest FP5 build Change-Id: I34a17c264866af009bcb406be657ad1dfe4ee70c --- vars/FP5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP5 b/vars/FP5 index e1dd363a..80ceab21 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.UT2K.B.098" +readonly build_id="FP5.UT2L.B.107" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2K-factory.zip" -readonly image_sha256="fa30bf3ab4862d2fb34c4df7bea9a07072df49fc5b93cdb503b5389fc86fafa2" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2L-factory.zip" +readonly image_sha256="3cca24a6791ca439b232a5dff12b75882b30614296c01115aabf0f72e9924ecf" -readonly security_patch="2025-01-05" +readonly security_patch="2025-02-05" From 058e586fd423d0df8fcaf12727e115941d618d00 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 2 Apr 2025 15:55:26 +0300 Subject: [PATCH 098/111] vars: Update to latest FP4 build Change-Id: Ie2435f6412550bf7bc7d27d39056fd88334a7b54 --- vars/FP4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP4 b/vars/FP4 index 7fd129de..7c17051b 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP4.TP2P.C.0130" +readonly build_id="FP4.TP2R.C.0132" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2P-factory.zip" -readonly image_sha256="a7dee94f3e3e2e42f3f41b12c682837dafe1ee34fc1aef08aa2b0a7753d985e2" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2R-factory.zip" +readonly image_sha256="0413b835083b893e44020f66337a59f9ba50f25ae07587199896ff12fa6abeca" -readonly security_patch="2025-01-05" +readonly security_patch="2025-03-05" From 06cd27a3da23cd0d1f61b4a64962da9a8df36358 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 8 Apr 2025 18:47:42 +0530 Subject: [PATCH 099/111] RIP Pixel 4-4a Change-Id: Ie22aa0f51a4d37d0512c2565550a64235187c587 --- vars/coral | 30 ------------------------------ vars/device_kernels | 2 -- vars/devices | 3 --- vars/flame | 29 ----------------------------- vars/msm-4.14 | 8 -------- vars/sunfish | 30 ------------------------------ 6 files changed, 102 deletions(-) delete mode 100644 vars/coral delete mode 100644 vars/flame delete mode 100644 vars/msm-4.14 delete mode 100644 vars/sunfish diff --git a/vars/coral b/vars/coral deleted file mode 100644 index 0981cdef..00000000 --- a/vars/coral +++ /dev/null @@ -1,30 +0,0 @@ -# Pixel 4 XL - -# Usage: ${device_repos[@]} -device_repos=( - device/google/coral - device/google/coral-sepolicy -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id="TP1A.221005.002.B2" - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="unknown" - -readonly prev_aosp_tag="android-13.0.0_r7" -readonly aosp_tag="android-13.0.0_r31" - -readonly build_number="9382335" - -readonly image_url="https://dl.google.com/dl/android/aosp/coral-tp1a.221005.002.b2-factory-db99b1f8.zip" -readonly image_sha256="db99b1f89e2fea16cbf48c876809c78d6dc46279e7311ab52d00d8125ef3a5d9" - -readonly flash_url="https://flash.android.com/build/9382335?target=coral-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/coral-ota-tp1a.221005.002.b2-9e04f1c9.zip" -readonly ota_sha256="9e04f1c9c2eaaf58d8186393d38661638784791f74a9e9d9a96a4359b144b9ed" - -readonly security_patch="2022-10-05" diff --git a/vars/device_kernels b/vars/device_kernels index 906f5210..8dffa2a9 100644 --- a/vars/device_kernels +++ b/vars/device_kernels @@ -1,6 +1,4 @@ # Usage: ${device_kernels[@]} readonly device_kernels=( redbull - sunfish - coral ) diff --git a/vars/devices b/vars/devices index 01636342..59fd8683 100644 --- a/vars/devices +++ b/vars/devices @@ -25,7 +25,4 @@ readonly devices=( barbet redfin bramble - sunfish - coral - flame ) diff --git a/vars/flame b/vars/flame deleted file mode 100644 index c1b48d2a..00000000 --- a/vars/flame +++ /dev/null @@ -1,29 +0,0 @@ -# Pixel 4 - -# Usage: ${device_repos[@]} -device_repos=( - # common repos in coral -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id="TP1A.221005.002.B2" - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="unknown" - -readonly prev_aosp_tag="android-13.0.0_r7" -readonly aosp_tag="android-13.0.0_r31" - -readonly build_number="9382335" - -readonly image_url="https://dl.google.com/dl/android/aosp/flame-tp1a.221005.002.b2-factory-38e4f49a.zip" -readonly image_sha256="38e4f49a8f72a8f9522f86874187de47add539372fa8c951d11ebde4f9c21103" - -readonly flash_url="https://flash.android.com/build/9382335?target=flame-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/flame-ota-tp1a.221005.002.b2-4d76895a.zip" -readonly ota_sha256="4d76895aac34a8bb816a338439ee62ca0794628228cf4c1330b4e40a5c8cb4af" - -readonly security_patch="2022-10-05" diff --git a/vars/msm-4.14 b/vars/msm-4.14 deleted file mode 100644 index 590ac8b9..00000000 --- a/vars/msm-4.14 +++ /dev/null @@ -1,8 +0,0 @@ -# Pixel 4, 4a - -# Updated semi-manually via pixel/update-any-var.sh - -readonly kernel_branch="android-msm-sunfish-4.14-android13-qpr3" - -readonly prev_kernel_tag=android-13.0.0_r0.101 # Jul 2023 -readonly kernel_tag=android-13.0.0_r0.110 # Aug 2023 diff --git a/vars/sunfish b/vars/sunfish deleted file mode 100644 index 2c7c9243..00000000 --- a/vars/sunfish +++ /dev/null @@ -1,30 +0,0 @@ -# Pixel 4a - -# Usage: ${device_repos[@]} -device_repos=( - device/google/sunfish - device/google/sunfish-sepolicy -) - -# Updated semi-manually via pixel/update-any-var.sh - -readonly build_id="TQ3A.230805.001.S1" - -# Updated automatically via pixel/update-device-vars.sh - -readonly aosp_branch="android13-qpr3-s14-release" - -readonly prev_aosp_tag="android-13.0.0_r67" -readonly aosp_tag="android-13.0.0_r83" - -readonly build_number="10786265" - -readonly image_url="https://dl.google.com/dl/android/aosp/sunfish-tq3a.230805.001.s1-factory-82902ea9.zip" -readonly image_sha256="82902ea98c80f1a22706279a30d2bc46aa55cbe60703c9a02ba043bd052c6d99" - -readonly flash_url="https://flash.android.com/build/10786265?target=sunfish-user&signed" - -readonly ota_url="https://dl.google.com/dl/android/aosp/sunfish-ota-tq3a.230805.001.s1-965296b1.zip" -readonly ota_sha256="965296b1498b1d71bbf4013088b34213d5e6bc4dc836a7d06d1534eaf7621336" - -readonly security_patch="2023-08-05" From 9c7f7bcb23b6477f3f03f21f7c07d84b0157303c Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 9 Apr 2025 02:13:44 +0300 Subject: [PATCH 100/111] vars: Add moto blair devices Change-Id: I00057a14a6e5e23137989d06805ba1fa2d546caf --- vars/bangkk | 7 +++++++ vars/devices | 3 +++ vars/fogo | 7 +++++++ vars/fogos | 8 ++++++++ vars/lineage_devices | 3 +++ vars/moto | 7 +++++-- 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 vars/bangkk create mode 100644 vars/fogo create mode 100644 vars/fogos diff --git a/vars/bangkk b/vars/bangkk new file mode 100644 index 00000000..350b9019 --- /dev/null +++ b/vars/bangkk @@ -0,0 +1,7 @@ +# moto g84 + +# Usage: ${device_repos[@]} +device_repos=( + device/motorola/bangkk + # common repos in fogos +) diff --git a/vars/devices b/vars/devices index 59fd8683..943ff3af 100644 --- a/vars/devices +++ b/vars/devices @@ -3,6 +3,9 @@ readonly devices=( FP5 FP4 + fogo + bangkk + fogos rhode hawao devon diff --git a/vars/fogo b/vars/fogo new file mode 100644 index 00000000..d7c62114 --- /dev/null +++ b/vars/fogo @@ -0,0 +1,7 @@ +# moto g 5G - 2024 + +# Usage: ${device_repos[@]} +device_repos=( + device/motorola/fogo + # common repos in fogos +) diff --git a/vars/fogos b/vars/fogos new file mode 100644 index 00000000..3edc09f8 --- /dev/null +++ b/vars/fogos @@ -0,0 +1,8 @@ +# moto g34/g45 + +# Usage: ${device_repos[@]} +device_repos=( + device/motorola/fogos + device/motorola/sm6375-common + kernel/motorola/sm6375 +) diff --git a/vars/lineage_devices b/vars/lineage_devices index aaccb2b6..78dc1c16 100644 --- a/vars/lineage_devices +++ b/vars/lineage_devices @@ -3,6 +3,9 @@ readonly lineage_devices=( FP5 FP4 + fogo + bangkk + fogos rhode hawao devon diff --git a/vars/moto b/vars/moto index a0bed993..211ea173 100644 --- a/vars/moto +++ b/vars/moto @@ -1,7 +1,10 @@ # Motorola devices # Usage: ${devices[@]} readonly devices=( - devon - hawao + fogo + bangkk + fogos rhode + hawao + devon ) From e3f68dd456e1930602e381c5cca8f7fa3d1cf76d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 9 Apr 2025 13:57:58 +0300 Subject: [PATCH 101/111] vars: Update to latest FP5 build Change-Id: I5ebb2cc181b424bcc915571feaa63e175155af3f --- vars/FP5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP5 b/vars/FP5 index 80ceab21..625e1ab8 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.UT2L.B.107" +readonly build_id="FP5.UT2M.B.113" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2L-factory.zip" -readonly image_sha256="3cca24a6791ca439b232a5dff12b75882b30614296c01115aabf0f72e9924ecf" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2M-factory.zip" +readonly image_sha256="de8479e17311ace558556a84c6422b9e069dc34ef2d830276b4a53db1c9e4e6c" -readonly security_patch="2025-02-05" +readonly security_patch="2025-03-05" From cdf2dad4420728c78702989bd9a09d906a8c46e0 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 11 Apr 2025 04:07:41 +0530 Subject: [PATCH 102/111] April 2025 Security update Change-Id: I6ab04acb0437fbb09f6e903e1a2057c49b253eb7 --- vars/akita | 20 ++++++++++---------- vars/bluejay | 18 +++++++++--------- vars/caiman | 18 +++++++++--------- vars/cheetah | 20 ++++++++++---------- vars/comet | 18 +++++++++--------- vars/common | 8 ++++---- vars/felix | 20 ++++++++++---------- vars/husky | 20 ++++++++++---------- vars/komodo | 18 +++++++++--------- vars/lynx | 20 ++++++++++---------- vars/oriole | 18 +++++++++--------- vars/panther | 20 ++++++++++---------- vars/raven | 18 +++++++++--------- vars/shiba | 20 ++++++++++---------- vars/tangorpro | 18 +++++++++--------- vars/tokay | 18 +++++++++--------- 16 files changed, 146 insertions(+), 146 deletions(-) diff --git a/vars/akita b/vars/akita index e610a23b..badf8406 100644 --- a/vars/akita +++ b/vars/akita @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-bp1a.250305.019-factory-33ce5db3.zip" -readonly image_sha256="33ce5db3f98b64d482cfb23b70a1877c928f88188d669aadccb71c0ae1178f7c" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-bp1a.250405.007.b1-factory-5ba1eee2.zip" +readonly image_sha256="5ba1eee26853553b4f8f4b105e30bef38dafd366aec1f555a46f1a5020e68150" -readonly flash_url="https://flash.android.com/build/13003188?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-bp1a.250305.019-04de80f4.zip" -readonly ota_sha256="04de80f4002ed32d73e57c717f3e2d7282d4560d37690243284cbb3bd0bd3208" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-bp1a.250405.007.b1-41104100.zip" +readonly ota_sha256="41104100f4a8cec4d929312344da9ca618d43ce35ab1c9b04d612c417bd9fc21" readonly security_patch="2025-03-05" diff --git a/vars/bluejay b/vars/bluejay index 4e4b3b24..7d7a0b5a 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13003188" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-bp1a.250305.019-factory-9dde1d1d.zip" -readonly image_sha256="9dde1d1d05778041f5cc439e01b73f2c7e9c8837d1d9192e4db1c435e27be169" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-bp1a.250405.007-factory-98ac49c0.zip" +readonly image_sha256="98ac49c04235c1cd6ff6b52eee92bf546fdad44d955c94d0eb045ac6b172fa29" -readonly flash_url="https://flash.android.com/build/13003188?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-bp1a.250305.019-4204a881.zip" -readonly ota_sha256="4204a8816afc7503df7ec1d461c4303bb6d4f6b9089a0d22c3309874a8efebdc" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-bp1a.250405.007-e5d6863a.zip" +readonly ota_sha256="e5d6863abed61b0247413c2797d4546585ba343d77e8e1001d14021ff81e4cda" readonly security_patch="2025-03-05" diff --git a/vars/caiman b/vars/caiman index a4a69a95..6efedf68 100644 --- a/vars/caiman +++ b/vars/caiman @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.020" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r21" +readonly prev_aosp_tag="android-15.0.0_r21" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13009785" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-bp1a.250305.020-factory-8ece3008.zip" -readonly image_sha256="8ece3008a79be804415daaee2e2e311662518de9f07f16bed8f56030351bdfdf" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-bp1a.250405.007-factory-950878bf.zip" +readonly image_sha256="950878bf853704c8cacba68dea87f811c5b85a51f4c224e73d5c2637eb01089d" -readonly flash_url="https://flash.android.com/build/13009785?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-bp1a.250305.020-d387782c.zip" -readonly ota_sha256="d387782c7a8e8d1663cc1f8c4b03b88ff00b6fff0aea9456a8eb66f628e631eb" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-bp1a.250405.007-7b8bf880.zip" +readonly ota_sha256="7b8bf880f0f6a0ab7edb87427728cdd7e1819083b642388bc92dbdf5bff939ec" readonly security_patch="2025-03-05" diff --git a/vars/cheetah b/vars/cheetah index 721f5e42..5a44df57 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-bp1a.250305.019-factory-22c3c6de.zip" -readonly image_sha256="22c3c6de8d2726a0e0be5eaa66fb753e9e4cd07ddaee9f1e322599053caa36d2" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-bp1a.250405.007.b1-factory-aac6510f.zip" +readonly image_sha256="aac6510f511b2c0163970a2d1dbff4bd2332d816ebaaa59f27da65cc6c9b8d54" -readonly flash_url="https://flash.android.com/build/13003188?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-bp1a.250305.019-9ab4e432.zip" -readonly ota_sha256="9ab4e432abec5e6c8e279c39034a508855dcad397e1ee310fbdf0dc16d564e3d" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-bp1a.250405.007.b1-b8f8c3a3.zip" +readonly ota_sha256="b8f8c3a358182a95ac22b66cc9d986236bf40c4d636566448be29666fafb9c39" readonly security_patch="2025-03-05" diff --git a/vars/comet b/vars/comet index 35df94da..d30203b4 100644 --- a/vars/comet +++ b/vars/comet @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.020" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r21" +readonly prev_aosp_tag="android-15.0.0_r21" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13009785" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-bp1a.250305.020-factory-3266bb9f.zip" -readonly image_sha256="3266bb9fc4b59d1d4d9b1a6746fb0b5985b2e80d64b005f36b49e4156ed90414" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-bp1a.250405.007-factory-ce4edfec.zip" +readonly image_sha256="ce4edfec961585cb1ac13988820cbc518e066a53dcc455c5473c4d974dfc8159" -readonly flash_url="https://flash.android.com/build/13009785?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-bp1a.250305.020-04e1162a.zip" -readonly ota_sha256="04e1162afd6c7ae41b5e09bb0697b78bf28858766f6d19ad17cfc9ffab9dafaa" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-bp1a.250405.007-3b5a62aa.zip" +readonly ota_sha256="3b5a62aab3c6d61f455025b40f166e8146339061b54bacc51cdc277a923cfc0a" readonly security_patch="2025-03-05" diff --git a/vars/common b/vars/common index b32bc373..de4d7403 100644 --- a/vars/common +++ b/vars/common @@ -7,12 +7,12 @@ readonly device_branch=android15-qpr2 readonly common_aosp_branch=android15-qpr2-release # Mar 2025 -readonly prev_common_aosp_tag=android-15.0.0_r21 # Mar 2025, Pixel 9 -readonly common_aosp_tag=android-15.0.0_r23 # Mar 2025, Pixel Tablet +readonly prev_common_aosp_tag=android-15.0.0_r23 # Mar 2025, Pixel Tablet +readonly common_aosp_tag=android-15.0.0_r26 # Apr 2025, Pixel 6, Tablet, 9 -readonly common_aosp_build_id=BP1A.250305.020.T2 # Mar 2025, Pixel Tablet +readonly common_aosp_build_id=BP1A.250505.007 # Apr 2025, Pixel 6, Tablet, 9 -readonly topic=mar25 +readonly topic=apr25 readonly lineageos_branch=lineage-22.2 readonly lineageos_device_branch=lineage-22.2 diff --git a/vars/felix b/vars/felix index ccb98d80..19021689 100644 --- a/vars/felix +++ b/vars/felix @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-bp1a.250305.019-factory-45f5bf57.zip" -readonly image_sha256="45f5bf57224f2efab8b212429f5724a6129a45e0fc317b154556bd564b4edc91" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-bp1a.250405.007.b1-factory-6c332e63.zip" +readonly image_sha256="6c332e63d10e107022a6e98fe1158e51a30d74c7246fd03f7b5047f160816d6f" -readonly flash_url="https://flash.android.com/build/13003188?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-bp1a.250305.019-d192005d.zip" -readonly ota_sha256="d192005dd50d1b8cd4e5fe1a8cf5b13fc2a615aa0009747f3eab5a67a81a5fc2" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-bp1a.250405.007.b1-47a063fc.zip" +readonly ota_sha256="47a063fcdd6fc3b9806e88198c5ae2af209e128644f980ddf9e49a03bdc56cf8" readonly security_patch="2025-03-05" diff --git a/vars/husky b/vars/husky index 7bdc1839..12c8c143 100644 --- a/vars/husky +++ b/vars/husky @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-bp1a.250305.019-factory-426dde3f.zip" -readonly image_sha256="426dde3fbfb497fa5320c2d43e0f219dc778b2a5f9bd5d1080efc6ec7ce831df" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-bp1a.250405.007.b1-factory-f8bcae5c.zip" +readonly image_sha256="f8bcae5cd37f7a01af3b605054b67e6cb7863a13e902771fe02f48cc314a5708" -readonly flash_url="https://flash.android.com/build/13003188?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-bp1a.250305.019-b4977f37.zip" -readonly ota_sha256="b4977f37cd8e58d791aecfe28fa8018c9688ae3d0cd7871c5ff37b0ff27368cc" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-bp1a.250405.007.b1-d034f12f.zip" +readonly ota_sha256="d034f12f0fb47528232dbd61445d92773a9bfc2d82e5d5063e2c5b0b893147aa" readonly security_patch="2025-03-05" diff --git a/vars/komodo b/vars/komodo index 0ee7fe0e..8797db0a 100644 --- a/vars/komodo +++ b/vars/komodo @@ -11,23 +11,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.020" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r21" +readonly prev_aosp_tag="android-15.0.0_r21" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13009785" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-bp1a.250305.020-factory-43dd7f7c.zip" -readonly image_sha256="43dd7f7c1024945ff4ff251b7b6959a0cb43076db356712dabbd14a48ba2e72b" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-bp1a.250405.007-factory-46dbfd07.zip" +readonly image_sha256="46dbfd07289ebbded3f958d321b9a0e52a3c93e386d7e6684cf67d9c3b7c2b6c" -readonly flash_url="https://flash.android.com/build/13009785?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-bp1a.250305.020-20c1d368.zip" -readonly ota_sha256="20c1d36846fa1d7e7df6e2566baceadb88f4430ec3b230ef13236fbd7d256b91" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-bp1a.250405.007-9cdf83da.zip" +readonly ota_sha256="9cdf83dab94da9c40c7a4ba5c4f67c6fe11cb98882c7acbf71919b41b7ada470" readonly security_patch="2025-03-05" diff --git a/vars/lynx b/vars/lynx index c498b4e7..8a993706 100644 --- a/vars/lynx +++ b/vars/lynx @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-bp1a.250305.019-factory-06015c27.zip" -readonly image_sha256="06015c27d6368a48249fd423bca104564fe1d0de6c721213e76b282c19cac6e9" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-bp1a.250405.007.b1-factory-890f6c72.zip" +readonly image_sha256="890f6c72f1ac83504231738c8206434392a37acf6cf040cf32b132b30804a3f9" -readonly flash_url="https://flash.android.com/build/13003188?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-bp1a.250305.019-36e763c0.zip" -readonly ota_sha256="36e763c070fd69a75df099c88321c7968c167ec3b73542176db76c61c4585852" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-bp1a.250405.007.b1-6cb487eb.zip" +readonly ota_sha256="6cb487eb3c138334a1095e16ed80e92855da5779d9d853c327bcbf874c5d24f2" readonly security_patch="2025-03-05" diff --git a/vars/oriole b/vars/oriole index e2b47105..c80ecd4a 100644 --- a/vars/oriole +++ b/vars/oriole @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13003188" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-bp1a.250305.019-factory-9015126c.zip" -readonly image_sha256="9015126cd05c898aecd24d2c2a97e1f7bbb1a5a9f6505b157fa63728115ab72d" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-bp1a.250405.007-factory-d10fc84d.zip" +readonly image_sha256="d10fc84d9422866c05ead51655dba48f9653dc7c6e22d645b0d63a0355634d60" -readonly flash_url="https://flash.android.com/build/13003188?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-bp1a.250305.019-34e04bed.zip" -readonly ota_sha256="34e04bed74a71493ea8d30737d972278464cad36a5dc6761bf2723fc25969196" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-bp1a.250405.007-2c7a83a9.zip" +readonly ota_sha256="2c7a83a95f62efab8b525f2c2246b9657e965fd8ca2f0c87428e77ba0404b161" readonly security_patch="2025-03-05" diff --git a/vars/panther b/vars/panther index 9b677345..8928e588 100644 --- a/vars/panther +++ b/vars/panther @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-bp1a.250305.019-factory-3cc92367.zip" -readonly image_sha256="3cc92367035891fa3a5faec83238dc450738502df12c9e8d4d681b5bb7c5e943" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-bp1a.250405.007.b1-factory-ec427907.zip" +readonly image_sha256="ec427907286ebfc0ce5b432e9ef2108e9397afe8a7a3d6a55d575eb8aae856b7" -readonly flash_url="https://flash.android.com/build/13003188?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-bp1a.250305.019-a16052a5.zip" -readonly ota_sha256="a16052a5a86d6ee2b54ab63c9dab7555f43e8e943b111d3656b02dfa3cb368e0" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-bp1a.250405.007.b1-32410308.zip" +readonly ota_sha256="32410308e4adbe94c95c379b5c76a9d622f94b01d4bf189da8508c67b1ad5484" readonly security_patch="2025-03-05" diff --git a/vars/raven b/vars/raven index b05e0b6d..62e036ae 100644 --- a/vars/raven +++ b/vars/raven @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13003188" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-bp1a.250305.019-factory-6bccc073.zip" -readonly image_sha256="6bccc073b56d02cc0ce465aa927a3da612ee86d7b23f7b620b95f5b89bef4071" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-bp1a.250405.007-factory-ab3ddad9.zip" +readonly image_sha256="ab3ddad95af670565fdd408dd28965cc93747828784f4a8a041d6f5fb1ca2008" -readonly flash_url="https://flash.android.com/build/13003188?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-bp1a.250305.019-2c923d08.zip" -readonly ota_sha256="2c923d08026d4a37bc76ebf3c184d84028204216c328ff907fbf9b4ff2c0d712" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-bp1a.250405.007-5a4948f7.zip" +readonly ota_sha256="5a4948f71317c8b48211d82fe5d6de204ceb5d517ba31e5732f1cbb41945628b" readonly security_patch="2025-03-05" diff --git a/vars/shiba b/vars/shiba index 6c98e5c8..4f3939a8 100644 --- a/vars/shiba +++ b/vars/shiba @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.019" +readonly build_id="BP1A.250405.007.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-release" +readonly aosp_branch="android15-qpr2-s4-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r20" +readonly prev_aosp_tag="android-15.0.0_r20" +readonly aosp_tag="android-15.0.0_r28" -readonly build_number="13003188" +readonly build_number="13240308" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-bp1a.250305.019-factory-4401ad97.zip" -readonly image_sha256="4401ad979ea4f5dbfabb51cd865df1dfae90a23ef4943a281d3f749002308117" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-bp1a.250405.007.b1-factory-e3f1e44d.zip" +readonly image_sha256="e3f1e44d4c9ce489a795773a3c993da8a4749b02423b5a3264864cf9526d1c54" -readonly flash_url="https://flash.android.com/build/13003188?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/13240308?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-bp1a.250305.019-1f4e6c4d.zip" -readonly ota_sha256="1f4e6c4da9ee3419d8547848a13021badad86a7f249fb5a0983df04b47fe92ae" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-bp1a.250405.007.b1-1e0873e1.zip" +readonly ota_sha256="1e0873e13caf6c9413971299223ae9420b284339eb468852032c7c0258d0fb17" readonly security_patch="2025-03-05" diff --git a/vars/tangorpro b/vars/tangorpro index b7a1c651..14ec9037 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.020.T2" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r23" +readonly prev_aosp_tag="android-15.0.0_r23" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13023825" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-bp1a.250305.020.t2-factory-908d0b5d.zip" -readonly image_sha256="908d0b5d6310577999039f1c9ff6e4eb28bc44084d9a948a5c741fdd77313ed7" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-bp1a.250405.007-factory-834a2dad.zip" +readonly image_sha256="834a2dad178c1ab094a05bf001f35f0417ab7f25c2be9ee0f768cf1228c9a47d" -readonly flash_url="https://flash.android.com/build/13023825?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-bp1a.250305.020.t2-da00f6f9.zip" -readonly ota_sha256="da00f6f91942ec878fb102af3fc033491109cf9856bbfb50f8f9436dfb45378d" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-bp1a.250405.007-1f45c9ae.zip" +readonly ota_sha256="1f45c9ae13a234fae62c23a2dd16ca6c7548419f2113cdadd1db640cf41af347" readonly security_patch="2025-03-05" diff --git a/vars/tokay b/vars/tokay index 8964b781..7a841c50 100644 --- a/vars/tokay +++ b/vars/tokay @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250305.020" +readonly build_id="BP1A.250405.007" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r14" -readonly aosp_tag="android-15.0.0_r21" +readonly prev_aosp_tag="android-15.0.0_r21" +readonly aosp_tag="android-15.0.0_r26" -readonly build_number="13009785" +readonly build_number="13240079" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-bp1a.250305.020-factory-b62074e2.zip" -readonly image_sha256="b62074e2bc6b9c95f360a8519498ddd22e5fd79df784e0ba50fc81334a79204d" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-bp1a.250405.007-factory-96c1fe1d.zip" +readonly image_sha256="96c1fe1d6816a6da4ef2d98aa3c072d1ea2254bcb653276a88ef10f29cf97c3a" -readonly flash_url="https://flash.android.com/build/13009785?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/13240079?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-bp1a.250305.020-b9e71d08.zip" -readonly ota_sha256="b9e71d0833afee1b5b8ff84dbce4d335376925b9db6c4c8e1b1d29b447c2e4a7" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-bp1a.250405.007-2eebf294.zip" +readonly ota_sha256="2eebf294075a6ac08520b14b3eb3f85eaf4dcd592ee02dd837752dcf2fd53154" readonly security_patch="2025-03-05" From 64d26fd2732a5cf22e87f38166d68dc8f8491e1e Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 11 Apr 2025 15:46:44 +0300 Subject: [PATCH 103/111] vars: Update security patch level manually Google forgot to update build/release again Change-Id: I65eb053cd9c97538e2c9ff923951d60c4879e939 --- vars/akita | 2 +- vars/bluejay | 2 +- vars/caiman | 2 +- vars/cheetah | 2 +- vars/comet | 2 +- vars/felix | 2 +- vars/husky | 2 +- vars/komodo | 2 +- vars/lynx | 2 +- vars/oriole | 2 +- vars/panther | 2 +- vars/raven | 2 +- vars/shiba | 2 +- vars/tangorpro | 2 +- vars/tokay | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/vars/akita b/vars/akita index badf8406..47dd3543 100644 --- a/vars/akita +++ b/vars/akita @@ -27,4 +27,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=akita-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-bp1a.250405.007.b1-41104100.zip" readonly ota_sha256="41104100f4a8cec4d929312344da9ca618d43ce35ab1c9b04d612c417bd9fc21" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/bluejay b/vars/bluejay index 7d7a0b5a..23bc2c73 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -27,4 +27,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=bluejay-user readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-bp1a.250405.007-e5d6863a.zip" readonly ota_sha256="e5d6863abed61b0247413c2797d4546585ba343d77e8e1001d14021ff81e4cda" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/caiman b/vars/caiman index 6efedf68..c31dffac 100644 --- a/vars/caiman +++ b/vars/caiman @@ -26,4 +26,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=caiman-user& readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-bp1a.250405.007-7b8bf880.zip" readonly ota_sha256="7b8bf880f0f6a0ab7edb87427728cdd7e1819083b642388bc92dbdf5bff939ec" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/cheetah b/vars/cheetah index 5a44df57..06bab89f 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -28,4 +28,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=cheetah-user readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-bp1a.250405.007.b1-b8f8c3a3.zip" readonly ota_sha256="b8f8c3a358182a95ac22b66cc9d986236bf40c4d636566448be29666fafb9c39" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/comet b/vars/comet index d30203b4..a1a7b70a 100644 --- a/vars/comet +++ b/vars/comet @@ -27,4 +27,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=comet-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-bp1a.250405.007-3b5a62aa.zip" readonly ota_sha256="3b5a62aab3c6d61f455025b40f166e8146339061b54bacc51cdc277a923cfc0a" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/felix b/vars/felix index 19021689..d001cdf4 100644 --- a/vars/felix +++ b/vars/felix @@ -27,4 +27,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=felix-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-bp1a.250405.007.b1-47a063fc.zip" readonly ota_sha256="47a063fcdd6fc3b9806e88198c5ae2af209e128644f980ddf9e49a03bdc56cf8" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/husky b/vars/husky index 12c8c143..4827402c 100644 --- a/vars/husky +++ b/vars/husky @@ -29,4 +29,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=husky-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-bp1a.250405.007.b1-d034f12f.zip" readonly ota_sha256="d034f12f0fb47528232dbd61445d92773a9bfc2d82e5d5063e2c5b0b893147aa" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/komodo b/vars/komodo index 8797db0a..bb42325f 100644 --- a/vars/komodo +++ b/vars/komodo @@ -30,4 +30,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=komodo-user& readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-bp1a.250405.007-9cdf83da.zip" readonly ota_sha256="9cdf83dab94da9c40c7a4ba5c4f67c6fe11cb98882c7acbf71919b41b7ada470" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/lynx b/vars/lynx index 8a993706..32ba55a9 100644 --- a/vars/lynx +++ b/vars/lynx @@ -27,4 +27,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=lynx-user&si readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-bp1a.250405.007.b1-6cb487eb.zip" readonly ota_sha256="6cb487eb3c138334a1095e16ed80e92855da5779d9d853c327bcbf874c5d24f2" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/oriole b/vars/oriole index c80ecd4a..95cf00c1 100644 --- a/vars/oriole +++ b/vars/oriole @@ -26,4 +26,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=oriole-user& readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-bp1a.250405.007-2c7a83a9.zip" readonly ota_sha256="2c7a83a95f62efab8b525f2c2246b9657e965fd8ca2f0c87428e77ba0404b161" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/panther b/vars/panther index 8928e588..85b36cb8 100644 --- a/vars/panther +++ b/vars/panther @@ -26,4 +26,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=panther-user readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-bp1a.250405.007.b1-32410308.zip" readonly ota_sha256="32410308e4adbe94c95c379b5c76a9d622f94b01d4bf189da8508c67b1ad5484" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/raven b/vars/raven index 62e036ae..a0ead342 100644 --- a/vars/raven +++ b/vars/raven @@ -28,4 +28,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=raven-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-bp1a.250405.007-5a4948f7.zip" readonly ota_sha256="5a4948f71317c8b48211d82fe5d6de204ceb5d517ba31e5732f1cbb41945628b" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/shiba b/vars/shiba index 4f3939a8..c4f52f9d 100644 --- a/vars/shiba +++ b/vars/shiba @@ -26,4 +26,4 @@ readonly flash_url="https://flash.android.com/build/13240308?target=shiba-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-bp1a.250405.007.b1-1e0873e1.zip" readonly ota_sha256="1e0873e13caf6c9413971299223ae9420b284339eb468852032c7c0258d0fb17" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/tangorpro b/vars/tangorpro index 14ec9037..5e383a82 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -27,4 +27,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=tangorpro-us readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-bp1a.250405.007-1f45c9ae.zip" readonly ota_sha256="1f45c9ae13a234fae62c23a2dd16ca6c7548419f2113cdadd1db640cf41af347" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" diff --git a/vars/tokay b/vars/tokay index 7a841c50..94fd7272 100644 --- a/vars/tokay +++ b/vars/tokay @@ -26,4 +26,4 @@ readonly flash_url="https://flash.android.com/build/13240079?target=tokay-user&s readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-bp1a.250405.007-2eebf294.zip" readonly ota_sha256="2eebf294075a6ac08520b14b3eb3f85eaf4dcd592ee02dd837752dcf2fd53154" -readonly security_patch="2025-03-05" +readonly security_patch="2025-04-05" From 5c00127ce4cc20f0303b15cb3fb5e6e3332c8db0 Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Mon, 7 Apr 2025 15:29:59 -0400 Subject: [PATCH 104/111] carriersettings-extractor: Always show and allow editing enhanced 4G calling Issue: calyxos#2895 Change-Id: I244a9e8c41d4fb258e76d844743a869b64632d00 --- carriersettings-extractor/carriersettings_extractor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/carriersettings-extractor/carriersettings_extractor.py b/carriersettings-extractor/carriersettings_extractor.py index 1b827679..cdf22017 100755 --- a/carriersettings-extractor/carriersettings_extractor.py +++ b/carriersettings-extractor/carriersettings_extractor.py @@ -67,7 +67,10 @@ def parse_args(): "hide_carrier_network_settings_bool", "read_only_apn_fields_string_array", "read_only_apn_types_string_array", - "show_apn_setting_cdma_bool"] + "show_apn_setting_cdma_bool", + # Enhanced 4G toggles + "hide_enhanced_4g_lte_bool", + "editable_enhanced_4g_lte_bool"] threshold_configs = ["5g_nr_ssrsrp_thresholds_int_array", "5g_nr_sssinr_thresholds_int_array", From 19c56eb177037b02aefc413f09d67e8e09cbdf2f Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 24 Apr 2025 05:15:39 +0530 Subject: [PATCH 105/111] Build FP4 before FP5 * This list is used for a bunch of things, but also to build * There's a weird bug we've been hitting if FP4 is built after FP5 * Make this change to work around that for now Issue: calyxos#2425 Issue: calyxos#3189 Change-Id: I08a15dbf8bfaecdd84c3d6e7d95050925c0057d1 --- vars/devices | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/devices b/vars/devices index 943ff3af..1e73351c 100644 --- a/vars/devices +++ b/vars/devices @@ -1,8 +1,8 @@ # All supported devices # Usage: ${devices[@]} readonly devices=( - FP5 FP4 + FP5 fogo bangkk fogos From 0a5e0876bb5b96f47e25c143010eeb27b7d82eca Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 May 2025 01:29:05 +0530 Subject: [PATCH 106/111] May 2025 Security update Change-Id: I270a53f7fce11ae365c84e9a36fdd6a824e8d588 --- vars/akita | 22 +++++++++++----------- vars/bluejay | 20 ++++++++++---------- vars/caiman | 20 ++++++++++---------- vars/cheetah | 22 +++++++++++----------- vars/comet | 20 ++++++++++---------- vars/common | 10 +++++----- vars/felix | 22 +++++++++++----------- vars/husky | 22 +++++++++++----------- vars/komodo | 20 ++++++++++---------- vars/lynx | 22 +++++++++++----------- vars/oriole | 20 ++++++++++---------- vars/panther | 22 +++++++++++----------- vars/raven | 20 ++++++++++---------- vars/shiba | 22 +++++++++++----------- vars/tangorpro | 20 ++++++++++---------- vars/tokay | 20 ++++++++++---------- 16 files changed, 162 insertions(+), 162 deletions(-) diff --git a/vars/akita b/vars/akita index 47dd3543..fb19e14e 100644 --- a/vars/akita +++ b/vars/akita @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/akita-bp1a.250405.007.b1-factory-5ba1eee2.zip" -readonly image_sha256="5ba1eee26853553b4f8f4b105e30bef38dafd366aec1f555a46f1a5020e68150" +readonly image_url="https://dl.google.com/dl/android/aosp/akita-bp1a.250505.005.b1-factory-26869594.zip" +readonly image_sha256="26869594099ad5c1bd70d2303dbe768d4b93bb50d312251d45640ccdc45aae11" -readonly flash_url="https://flash.android.com/build/13240308?target=akita-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=akita-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-bp1a.250405.007.b1-41104100.zip" -readonly ota_sha256="41104100f4a8cec4d929312344da9ca618d43ce35ab1c9b04d612c417bd9fc21" +readonly ota_url="https://dl.google.com/dl/android/aosp/akita-ota-bp1a.250505.005.b1-405428be.zip" +readonly ota_sha256="405428be3836aba30e4ba6a001c790c9ff15154beafaa5d03e8c4abff5f663f1" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/bluejay b/vars/bluejay index 23bc2c73..43840b03 100644 --- a/vars/bluejay +++ b/vars/bluejay @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-bp1a.250405.007-factory-98ac49c0.zip" -readonly image_sha256="98ac49c04235c1cd6ff6b52eee92bf546fdad44d955c94d0eb045ac6b172fa29" +readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-bp1a.250505.005-factory-b5528397.zip" +readonly image_sha256="b552839786586b7f0c946abfb59478d5477531d94a164c10f2f577b0ef0861ab" -readonly flash_url="https://flash.android.com/build/13240079?target=bluejay-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=bluejay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-bp1a.250405.007-e5d6863a.zip" -readonly ota_sha256="e5d6863abed61b0247413c2797d4546585ba343d77e8e1001d14021ff81e4cda" +readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-bp1a.250505.005-728eab10.zip" +readonly ota_sha256="728eab10ee8393a04503e2f79cfe441f7f287a6dda4ba207d0550632009f6904" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/caiman b/vars/caiman index c31dffac..7a3f3f8e 100644 --- a/vars/caiman +++ b/vars/caiman @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r21" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/caiman-bp1a.250405.007-factory-950878bf.zip" -readonly image_sha256="950878bf853704c8cacba68dea87f811c5b85a51f4c224e73d5c2637eb01089d" +readonly image_url="https://dl.google.com/dl/android/aosp/caiman-bp1a.250505.005-factory-f158d94e.zip" +readonly image_sha256="f158d94e5e9209ed9b22a4a4d81b1ae70a1631410adf75d2a2a8297d02d7363a" -readonly flash_url="https://flash.android.com/build/13240079?target=caiman-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=caiman-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-bp1a.250405.007-7b8bf880.zip" -readonly ota_sha256="7b8bf880f0f6a0ab7edb87427728cdd7e1819083b642388bc92dbdf5bff939ec" +readonly ota_url="https://dl.google.com/dl/android/aosp/caiman-ota-bp1a.250505.005-fa38a01c.zip" +readonly ota_sha256="fa38a01c7f3eb8a96b6f9891a5db2b5b7d0492b10087981c0dae4ab3e313b7cd" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/cheetah b/vars/cheetah index 06bab89f..485b4895 100644 --- a/vars/cheetah +++ b/vars/cheetah @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-bp1a.250405.007.b1-factory-aac6510f.zip" -readonly image_sha256="aac6510f511b2c0163970a2d1dbff4bd2332d816ebaaa59f27da65cc6c9b8d54" +readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-bp1a.250505.005.b1-factory-c7b1354d.zip" +readonly image_sha256="c7b1354d87f6e478c1d2d982dbc296f1b589d6797575639085c0a3ea4c1da974" -readonly flash_url="https://flash.android.com/build/13240308?target=cheetah-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=cheetah-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-bp1a.250405.007.b1-b8f8c3a3.zip" -readonly ota_sha256="b8f8c3a358182a95ac22b66cc9d986236bf40c4d636566448be29666fafb9c39" +readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-bp1a.250505.005.b1-29966098.zip" +readonly ota_sha256="29966098f2f60bf571673a589d32ce6f516440f466830e926ca90e13211eade0" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/comet b/vars/comet index a1a7b70a..dbb7e130 100644 --- a/vars/comet +++ b/vars/comet @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r21" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/comet-bp1a.250405.007-factory-ce4edfec.zip" -readonly image_sha256="ce4edfec961585cb1ac13988820cbc518e066a53dcc455c5473c4d974dfc8159" +readonly image_url="https://dl.google.com/dl/android/aosp/comet-bp1a.250505.005-factory-7bab37e3.zip" +readonly image_sha256="7bab37e32a1ef699ec0bb01c6356e1565d8722459ccb975bdf837d03dea9c142" -readonly flash_url="https://flash.android.com/build/13240079?target=comet-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=comet-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-bp1a.250405.007-3b5a62aa.zip" -readonly ota_sha256="3b5a62aab3c6d61f455025b40f166e8146339061b54bacc51cdc277a923cfc0a" +readonly ota_url="https://dl.google.com/dl/android/aosp/comet-ota-bp1a.250505.005-d344e885.zip" +readonly ota_sha256="d344e8857143f34c9d16429f9de945a3db91ce01b2534654ad4c220fe4ed2630" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/common b/vars/common index de4d7403..3de8788c 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=android15-qpr2 readonly device_branch=android15-qpr2 -readonly common_aosp_branch=android15-qpr2-release # Mar 2025 +readonly common_aosp_branch=android15-qpr2-release # May 2025 -readonly prev_common_aosp_tag=android-15.0.0_r23 # Mar 2025, Pixel Tablet -readonly common_aosp_tag=android-15.0.0_r26 # Apr 2025, Pixel 6, Tablet, 9 +readonly prev_common_aosp_tag=android-15.0.0_r26 # Apr 2025, Pixel 6, Tablet, 9 +readonly common_aosp_tag=android-15.0.0_r32 # May 2025, Pixel 6, Tablet, 9 -readonly common_aosp_build_id=BP1A.250505.007 # Apr 2025, Pixel 6, Tablet, 9 +readonly common_aosp_build_id=BP1A.250505.005 # May 2025, Pixel 6, Tablet, 9 -readonly topic=apr25 +readonly topic=may25 readonly lineageos_branch=lineage-22.2 readonly lineageos_device_branch=lineage-22.2 diff --git a/vars/felix b/vars/felix index d001cdf4..9ecb7682 100644 --- a/vars/felix +++ b/vars/felix @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/felix-bp1a.250405.007.b1-factory-6c332e63.zip" -readonly image_sha256="6c332e63d10e107022a6e98fe1158e51a30d74c7246fd03f7b5047f160816d6f" +readonly image_url="https://dl.google.com/dl/android/aosp/felix-bp1a.250505.005.b1-factory-01439a87.zip" +readonly image_sha256="01439a870c037278406d7086c16943e211d4c79bb2504f45e3e23c055711d40a" -readonly flash_url="https://flash.android.com/build/13240308?target=felix-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=felix-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-bp1a.250405.007.b1-47a063fc.zip" -readonly ota_sha256="47a063fcdd6fc3b9806e88198c5ae2af209e128644f980ddf9e49a03bdc56cf8" +readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-bp1a.250505.005.b1-1685cbb9.zip" +readonly ota_sha256="1685cbb9451047059a04a5441635885ef899f186ae42a4e768e260ff5935c5cc" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/husky b/vars/husky index 4827402c..e1656900 100644 --- a/vars/husky +++ b/vars/husky @@ -10,23 +10,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/husky-bp1a.250405.007.b1-factory-f8bcae5c.zip" -readonly image_sha256="f8bcae5cd37f7a01af3b605054b67e6cb7863a13e902771fe02f48cc314a5708" +readonly image_url="https://dl.google.com/dl/android/aosp/husky-bp1a.250505.005.b1-factory-29f5f55f.zip" +readonly image_sha256="29f5f55fb3e85e751c7122d3b2e507772510e5fa7c98da7ec26721e735bc90a4" -readonly flash_url="https://flash.android.com/build/13240308?target=husky-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=husky-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-bp1a.250405.007.b1-d034f12f.zip" -readonly ota_sha256="d034f12f0fb47528232dbd61445d92773a9bfc2d82e5d5063e2c5b0b893147aa" +readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-bp1a.250505.005.b1-5f2620d8.zip" +readonly ota_sha256="5f2620d8b704c6ebd5bcc4077fdc7faa412552c6e2b9a56f8c3304ce4d4b8177" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/komodo b/vars/komodo index bb42325f..4406c007 100644 --- a/vars/komodo +++ b/vars/komodo @@ -11,23 +11,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r21" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/komodo-bp1a.250405.007-factory-46dbfd07.zip" -readonly image_sha256="46dbfd07289ebbded3f958d321b9a0e52a3c93e386d7e6684cf67d9c3b7c2b6c" +readonly image_url="https://dl.google.com/dl/android/aosp/komodo-bp1a.250505.005-factory-3945a024.zip" +readonly image_sha256="3945a02463894927d1272e46a28a2cf999dc9d5a9db046a9b215157a8404228b" -readonly flash_url="https://flash.android.com/build/13240079?target=komodo-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=komodo-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-bp1a.250405.007-9cdf83da.zip" -readonly ota_sha256="9cdf83dab94da9c40c7a4ba5c4f67c6fe11cb98882c7acbf71919b41b7ada470" +readonly ota_url="https://dl.google.com/dl/android/aosp/komodo-ota-bp1a.250505.005-8997fae7.zip" +readonly ota_sha256="8997fae7ef176ff6cd7ee35bf1c6435fb3ec30ce2b69b28e572f283e7443e266" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/lynx b/vars/lynx index 32ba55a9..cb6d41d5 100644 --- a/vars/lynx +++ b/vars/lynx @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/lynx-bp1a.250405.007.b1-factory-890f6c72.zip" -readonly image_sha256="890f6c72f1ac83504231738c8206434392a37acf6cf040cf32b132b30804a3f9" +readonly image_url="https://dl.google.com/dl/android/aosp/lynx-bp1a.250505.005.b1-factory-45a1393f.zip" +readonly image_sha256="45a1393fe222246fd7b2918e072b52c6e34a4048fcf3f6b8c840632b1acd128b" -readonly flash_url="https://flash.android.com/build/13240308?target=lynx-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=lynx-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-bp1a.250405.007.b1-6cb487eb.zip" -readonly ota_sha256="6cb487eb3c138334a1095e16ed80e92855da5779d9d853c327bcbf874c5d24f2" +readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-bp1a.250505.005.b1-db24813f.zip" +readonly ota_sha256="db24813f3c561f792a19c4015dabe2220e8ee2497ee435f8e6ace7a0a229f815" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/oriole b/vars/oriole index 95cf00c1..ea01c079 100644 --- a/vars/oriole +++ b/vars/oriole @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/oriole-bp1a.250405.007-factory-d10fc84d.zip" -readonly image_sha256="d10fc84d9422866c05ead51655dba48f9653dc7c6e22d645b0d63a0355634d60" +readonly image_url="https://dl.google.com/dl/android/aosp/oriole-bp1a.250505.005-factory-9fc37bcc.zip" +readonly image_sha256="9fc37bccc63a243d046f459d22cfbf0dd0ea26336f356c9dd3fe0525093316c1" -readonly flash_url="https://flash.android.com/build/13240079?target=oriole-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=oriole-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-bp1a.250405.007-2c7a83a9.zip" -readonly ota_sha256="2c7a83a95f62efab8b525f2c2246b9657e965fd8ca2f0c87428e77ba0404b161" +readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-bp1a.250505.005-0ac3ca61.zip" +readonly ota_sha256="0ac3ca6175db1b86ed666aa2079a1f8ad41ea67a52e5a9b834c09bde6a6e5a5f" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/panther b/vars/panther index 85b36cb8..122e20fd 100644 --- a/vars/panther +++ b/vars/panther @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/panther-bp1a.250405.007.b1-factory-ec427907.zip" -readonly image_sha256="ec427907286ebfc0ce5b432e9ef2108e9397afe8a7a3d6a55d575eb8aae856b7" +readonly image_url="https://dl.google.com/dl/android/aosp/panther-bp1a.250505.005.b1-factory-f3671e06.zip" +readonly image_sha256="f3671e060ad7c2597fd39e918f9a3aeb3f83c8948ddd295bd04655b8808bedf8" -readonly flash_url="https://flash.android.com/build/13240308?target=panther-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=panther-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-bp1a.250405.007.b1-32410308.zip" -readonly ota_sha256="32410308e4adbe94c95c379b5c76a9d622f94b01d4bf189da8508c67b1ad5484" +readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-bp1a.250505.005.b1-cf5588e6.zip" +readonly ota_sha256="cf5588e661121815a18522a4b56578254791f4fd8bec380fb1032be5921171ad" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/raven b/vars/raven index a0ead342..620bf4b1 100644 --- a/vars/raven +++ b/vars/raven @@ -9,23 +9,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/raven-bp1a.250405.007-factory-ab3ddad9.zip" -readonly image_sha256="ab3ddad95af670565fdd408dd28965cc93747828784f4a8a041d6f5fb1ca2008" +readonly image_url="https://dl.google.com/dl/android/aosp/raven-bp1a.250505.005-factory-3ded8f89.zip" +readonly image_sha256="3ded8f89d71d17f3cee423c017e69d0156d0a04c1e27e020c2fbb7d57918f0be" -readonly flash_url="https://flash.android.com/build/13240079?target=raven-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=raven-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-bp1a.250405.007-5a4948f7.zip" -readonly ota_sha256="5a4948f71317c8b48211d82fe5d6de204ceb5d517ba31e5732f1cbb41945628b" +readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-bp1a.250505.005-5793e41b.zip" +readonly ota_sha256="5793e41b178a28f1d4f114cf9d345b50e0b8e73f542ad522bbda1b18c1f0f32a" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/shiba b/vars/shiba index c4f52f9d..fa3e5317 100644 --- a/vars/shiba +++ b/vars/shiba @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007.B1" +readonly build_id="BP1A.250505.005.B1" # Updated automatically via pixel/update-device-vars.sh -readonly aosp_branch="android15-qpr2-s4-release" +readonly aosp_branch="android15-qpr2-s8-release" -readonly prev_aosp_tag="android-15.0.0_r20" -readonly aosp_tag="android-15.0.0_r28" +readonly prev_aosp_tag="android-15.0.0_r28" +readonly aosp_tag="android-15.0.0_r34" -readonly build_number="13240308" +readonly build_number="13277630" -readonly image_url="https://dl.google.com/dl/android/aosp/shiba-bp1a.250405.007.b1-factory-e3f1e44d.zip" -readonly image_sha256="e3f1e44d4c9ce489a795773a3c993da8a4749b02423b5a3264864cf9526d1c54" +readonly image_url="https://dl.google.com/dl/android/aosp/shiba-bp1a.250505.005.b1-factory-afdf8d90.zip" +readonly image_sha256="afdf8d90c7011d3834537868a69f4e34f4e5fa4b94572b71598b23caf3d7f320" -readonly flash_url="https://flash.android.com/build/13240308?target=shiba-user&signed" +readonly flash_url="https://flash.android.com/build/13277630?target=shiba-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-bp1a.250405.007.b1-1e0873e1.zip" -readonly ota_sha256="1e0873e13caf6c9413971299223ae9420b284339eb468852032c7c0258d0fb17" +readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-bp1a.250505.005.b1-6214dfec.zip" +readonly ota_sha256="6214dfec838ae04545749778c194bc16420c313e854392d1e6ae17a06d2f9e26" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/tangorpro b/vars/tangorpro index 5e383a82..c8f9f59b 100644 --- a/vars/tangorpro +++ b/vars/tangorpro @@ -8,23 +8,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r23" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-bp1a.250405.007-factory-834a2dad.zip" -readonly image_sha256="834a2dad178c1ab094a05bf001f35f0417ab7f25c2be9ee0f768cf1228c9a47d" +readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-bp1a.250505.005-factory-fbebb053.zip" +readonly image_sha256="fbebb0532ba8a9e3cdec28fbb67d0dc3eac9c964b65751ab0b2679ef655686a1" -readonly flash_url="https://flash.android.com/build/13240079?target=tangorpro-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=tangorpro-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-bp1a.250405.007-1f45c9ae.zip" -readonly ota_sha256="1f45c9ae13a234fae62c23a2dd16ca6c7548419f2113cdadd1db640cf41af347" +readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-bp1a.250505.005-a5bf2935.zip" +readonly ota_sha256="a5bf29350aaf1c958a724e07052d089b34d3a38536d2076058f2b1c5abc0c401" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" diff --git a/vars/tokay b/vars/tokay index 94fd7272..1d279df3 100644 --- a/vars/tokay +++ b/vars/tokay @@ -7,23 +7,23 @@ device_repos=( # Updated semi-manually via pixel/update-any-var.sh -readonly build_id="BP1A.250405.007" +readonly build_id="BP1A.250505.005" # Updated automatically via pixel/update-device-vars.sh readonly aosp_branch="android15-qpr2-release" -readonly prev_aosp_tag="android-15.0.0_r21" -readonly aosp_tag="android-15.0.0_r26" +readonly prev_aosp_tag="android-15.0.0_r26" +readonly aosp_tag="android-15.0.0_r32" -readonly build_number="13240079" +readonly build_number="13277524" -readonly image_url="https://dl.google.com/dl/android/aosp/tokay-bp1a.250405.007-factory-96c1fe1d.zip" -readonly image_sha256="96c1fe1d6816a6da4ef2d98aa3c072d1ea2254bcb653276a88ef10f29cf97c3a" +readonly image_url="https://dl.google.com/dl/android/aosp/tokay-bp1a.250505.005-factory-5e869188.zip" +readonly image_sha256="5e8691883c5004c15b72ab941533a44f164b2b6bdbf8393c8987da42ec31bbd8" -readonly flash_url="https://flash.android.com/build/13240079?target=tokay-user&signed" +readonly flash_url="https://flash.android.com/build/13277524?target=tokay-user&signed" -readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-bp1a.250405.007-2eebf294.zip" -readonly ota_sha256="2eebf294075a6ac08520b14b3eb3f85eaf4dcd592ee02dd837752dcf2fd53154" +readonly ota_url="https://dl.google.com/dl/android/aosp/tokay-ota-bp1a.250505.005-6c165ea5.zip" +readonly ota_sha256="6c165ea5f9a99e1effffb31924ad65067b99ac74c9741720546633eeff607148" -readonly security_patch="2025-04-05" +readonly security_patch="2025-05-05" From 0fb6e51e2406380699d59a3f7b68714b7d0a502f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 14 May 2025 00:14:26 +0300 Subject: [PATCH 107/111] vars: Update to latest FP5 build Change-Id: Ic1f0838e1320347da25048bc942d544fcc1744eb --- vars/FP5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/FP5 b/vars/FP5 index 625e1ab8..97788737 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.UT2M.B.113" +readonly build_id="FP5.UT2P.B.122" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2M-factory.zip" -readonly image_sha256="de8479e17311ace558556a84c6422b9e069dc34ef2d830276b4a53db1c9e4e6c" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2P-factory.zip" +readonly image_sha256="cc62ed82039580b921d8300331015dd01be034c0d3c9f170603aa46ee99fd849" -readonly security_patch="2025-03-05" +readonly security_patch="2025-05-05" From cedf0439aabc25f57df70d893286b7815c30777d Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 12 Apr 2025 01:38:02 +0530 Subject: [PATCH 108/111] Add a new variable file, devices except pixels We typically end up building * Pixel Security updates for 'pixels' first * Then that for 'notpixels' * Feature update for all 'devices' Change-Id: I51c2d05c9e4a944074fa14a51ae66372071ee20b --- vars/notpixels | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 vars/notpixels diff --git a/vars/notpixels b/vars/notpixels new file mode 100644 index 00000000..d16e113b --- /dev/null +++ b/vars/notpixels @@ -0,0 +1,16 @@ +# All supported devices except Google Pixels currently supported in AOSP +# Usage: ${devices[@]} +readonly devices=( + FP4 + FP5 + fogo + bangkk + fogos + rhode + hawao + devon + otter + barbet + redfin + bramble +) From f4430427f2ce3b41f89944c7ae623844ec885f6a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 3 Jun 2025 00:17:30 +0300 Subject: [PATCH 109/111] vars: June 2025 Security Update Change-Id: I46695f68cb1e3932a1298ed86df4f855764a58a0 --- vars/common | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/common b/vars/common index 3de8788c..bd60d1cd 100644 --- a/vars/common +++ b/vars/common @@ -5,14 +5,14 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh readonly os_branch=android15-qpr2 readonly device_branch=android15-qpr2 -readonly common_aosp_branch=android15-qpr2-release # May 2025 +readonly common_aosp_branch=android15-security-release # June 2025 -readonly prev_common_aosp_tag=android-15.0.0_r26 # Apr 2025, Pixel 6, Tablet, 9 -readonly common_aosp_tag=android-15.0.0_r32 # May 2025, Pixel 6, Tablet, 9 +readonly prev_common_aosp_tag=android-15.0.0_r32 # May 2025, Pixel 6, Tablet, 9 +readonly common_aosp_tag=android-security-15.0.0_r9 # June 2025, Security readonly common_aosp_build_id=BP1A.250505.005 # May 2025, Pixel 6, Tablet, 9 -readonly topic=may25 +readonly topic=jun25 readonly lineageos_branch=lineage-22.2 readonly lineageos_device_branch=lineage-22.2 From 393a752d4c37207d112fc8867bc155c529a159b3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 10 Jun 2025 16:52:33 +0300 Subject: [PATCH 110/111] aosp-merger: Use git push to upload changes repo seems to be broken, mimic what lineage scripts do. This is the only place repo upload is used except the no longer used upload-squash script Change-Id: I15637222f09b772defbcf6eed535f9d07a1090c5 --- aosp-merger/upload-merge.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/aosp-merger/upload-merge.sh b/aosp-merger/upload-merge.sh index 065a910a..6316549e 100755 --- a/aosp-merger/upload-merge.sh +++ b/aosp-merger/upload-merge.sh @@ -48,6 +48,11 @@ else TOPIC="${topic}" fi +# Source build environment (needed for calyxremote) +source "${TOP}/build/envsetup.sh" +export ANDROID_BUILD_TOP=$(gettop) +source "${TOP}/vendor/calyx/build/envsetup.sh" + # List of merged repos PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') @@ -67,6 +72,14 @@ echo "#### Verification complete - no uncommitted changes found ####" # Iterate over each forked project for PROJECTPATH in ${PROJECTPATHS}; do cd "${TOP}/${PROJECTPATH}" + + BRANCH=$(git config --get branch.${STAGINGBRANCH}.merge | sed 's|refs/heads/||') + if [ -z "${BRANCH}" ]; then + BRANCH="${os_branch}" + fi + echo -e "\n#### Pushing ${PROJECTPATH} merge to review ####" - repo upload -c -y --no-verify -o topic="${TOPIC}" . + git checkout "${STAGINGBRANCH}" + calyxremote | grep -v "Remote 'calyx' created" + git push calyx HEAD:refs/for/"${BRANCH}"%topic="${TOPIC}" done From c64fa2f0591d34b87717a6d38dfeaf4348012d67 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 31 Jul 2025 17:43:28 +0300 Subject: [PATCH 111/111] vars: Update fairphone images Change-Id: I1e2a644aec22bf68e907fdbe1b2fd3685d6ecac0 --- vars/FP4 | 8 ++++---- vars/FP5 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vars/FP4 b/vars/FP4 index 7c17051b..532d5ebf 100644 --- a/vars/FP4 +++ b/vars/FP4 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP4.TP2R.C.0132" +readonly build_id="FP4.TP2U.C.0136" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2R-factory.zip" -readonly image_sha256="0413b835083b893e44020f66337a59f9ba50f25ae07587199896ff12fa6abeca" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP4/A13/FP4-TP2U-factory.zip" +readonly image_sha256="0b1acc2927c9fbac54a3208db8ae520f736da1ccb151f56bb0a561bbbb85b4d3" -readonly security_patch="2025-03-05" +readonly security_patch="2025-06-05" diff --git a/vars/FP5 b/vars/FP5 index 97788737..59d85270 100644 --- a/vars/FP5 +++ b/vars/FP5 @@ -7,9 +7,9 @@ device_repos=( ) # Updated manually -readonly build_id="FP5.UT2P.B.122" +readonly build_id="FP5.VT28.C.042" -readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A14/FP5-UT2P-factory.zip" -readonly image_sha256="cc62ed82039580b921d8300331015dd01be034c0d3c9f170603aa46ee99fd849" +readonly image_url="https://fairphone-android-builds.ams3.digitaloceanspaces.com/FP5/A15/FP5-VT28-factory.zip" +readonly image_sha256="3f50414b84d87c35b7db22e03839faef372fc991a2137ce99c925f65fc834a44" -readonly security_patch="2025-05-05" +readonly security_patch="2025-06-05"