Commit Graph

270 Commits

Author SHA1 Message Date
Michael Bestas ff3a87c8fc vars: Remove msm-4.9 kernel
Change-Id: I1ab4169b49a5124ed4878834a4a483816c90f581
2022-07-07 16:23:05 +05:30
Chirayu Desai 8132c1c492 July 2022 Security update
Change-Id: I9f6db6fc9bfa01ba6537c207351848f235b69341
2022-07-07 16:23:03 +05:30
Chirayu Desai b3acf2fee2 vars/pixels: Drop Pixel 3a
* No longer getting updates

Change-Id: Ib8c0994e04e744973cf2f5c3daa279718a9bf323
2022-07-06 13:21:55 -04:00
Chirayu Desai 35d59304c8 pixel/build-desc-fingerprint: Don't set -x
Change-Id: Iadae27ab29b6912e194823a46dbacfa0bd3c63e3
2022-06-28 18:49:03 +05:30
Chirayu Desai 3b84a5d2cb Pixel 3 June 2022 update
Change-Id: Iab663dafc29c0cecb996df664890a9910ecd8331
2022-06-28 04:53:19 +05:30
Chirayu Desai ea531e70b6 Introduce pixel device and kernel specific branches
* Same as previous commit, to make merging easy

Change-Id: I581303295fa7b6d929e63087c3ae092f8e4ec1de
2022-06-07 06:29:49 +05:30
Chirayu Desai 7bb9e94c54 vars: Introduce common_aosp_branch
* Make merging (especially review) easier by pushing upstream branch.
* That way gerrit shows a full non-squash merge as just 1 commit,
  making it so easy to review

Change-Id: If7b9fae728b588ad36f110c2218befa15a070e3c
2022-06-07 06:29:49 +05:30
Chirayu Desai 687b9fb568 Jun 2022 Security update & Feature drop
Change-Id: I83d70b6625155ed712179dc3757e81a9b8dd42d0
2022-06-07 06:29:49 +05:30
Michael Bestas 0dea56dfb7 pixel: Remove double slash from paths
Change-Id: I12c725b1fe3acc9ea062c575d6d8c6b6a37c6716
2022-06-06 10:58:17 -04:00
Chirayu Desai 4765a346b1 vars: Add FP4 and 3 OPs to devices
Change-Id: I2ea28e212676c982760599d0de6bb4eb61585b78
2022-05-07 03:44:11 +05:30
Chirayu Desai 41dc1d2c63 vars: Drop b1c1 from pixels
Change-Id: I9fb7fd076ed19c7c5f60d4a8f258e363eaeb555e
2022-05-07 01:14:27 +05:30
Chirayu Desai ae4923ffb9 aosp-merger: Use pixels for device list
Change-Id: Ib9eb5ca0c600bc5e3c9272cf286581ad8d11cce8
2022-05-07 01:14:08 +05:30
Chirayu Desai ea6a012d34 vars: Flip device order, newest first
Change-Id: I90169608fbee832e47a0a6bb5a908b5e4c19cda7
2022-05-07 01:13:59 +05:30
Chirayu Desai 1fc3794cbc May 2022 Security update
* raviole gki_kernel_tag handled manually this month,
  TODO: Script

Ref:
* https://groups.google.com/g/android-building/c/GoMawyG2l94/m/zB2a0UXCAgAJ

Change-Id: I236572036790189e9e6451ff8ee9a0e207d5f99f
2022-05-03 14:04:22 +05:30
Chirayu Desai 5c302cd547 pixel: Run regen-vendor before extracting
Change-Id: I8d173f5f165b0b36f6c0fb9243794779f1d7741a
2022-05-02 18:30:19 -04:00
Michael Bestas 78de9ccc38
vars: Remove extra newlines
Change-Id: I863cc1a982ed659ee1ba750985f6f01a4d9bd5be
2022-04-06 23:03:27 +03:00
Chirayu Desai 833bde07f8 April 2022 Security update
Change-Id: I26018393b36d896cef91c2c4022fa3cbaa9ddec7
2022-04-05 01:36:48 +05:30
Chirayu Desai 0b49525c53 fixup! pixel/get-new-device-vars: Handle failure gracefully
Change-Id: I741b299afd8ffddcbd8f70d212fb6cda871efd9b
2022-04-05 01:25:16 +05:30
Chirayu Desai 61ca218b71 pixel/firmware: Use prebuilts/extract-tools/qc_image_unpacker
Change-Id: I4909fb1ec172f618699fbe181563991fddaf281c
2022-03-25 12:48:42 -04:00
Chirayu Desai be4e93981d vars: March 2022, 12L for Pixel 6
* We can finally move on from beta3
* https://groups.google.com/g/android-building/c/GoMawyG2l94/m/uqaM24A8AgAJ

Change-Id: Idbcbd663130f3a1537a9bae1771f0fc13e5c801f
2022-03-22 16:03:26 +05:30
Chirayu Desai d1d5596a69 raviole: 12L beta3
* Since stable 12L isn't out yet for raviole, let's use beta3
* We have the kernel, and the factory images. Everything else will
  be from the QC 12L tag, android-12.1.0_r1
* Download links are gone from Google's site, and I can't find any
  archives, however I did get them from https://www.xda-developers.com/android-12l-beta-3/
* sha256sum calculated manually, but since the first bit is in the filename
  it should be fine. Can always do a binary transparency check / vbmeta verification.
  They still come from Google's servers anyways!

Change-Id: I18cdcda633d8a0c38239024bd472d19bf6bf8b8b
2022-03-10 04:55:48 +05:30
Chirayu Desai 400653a44a QC Pixels: 12L, March 2022 Security update
* We usually use the sunfish tag for coral/sunfish/4.14,
  however this time coral is ahead, has an extra commit
* See: https://android.googlesource.com/kernel/msm/+log/refs/tags/android-12.1.0_r0.2

Change-Id: I8a8148430a598ac6a017ef8704e0f793ee0b2e94
2022-03-09 04:27:48 +05:30
Chirayu Desai 7142f0d8d6 common: 12L
Change-Id: I9a2b5028ff4fbf8fdbb7055ef09d04bb01b1f868
2022-03-09 01:22:45 +05:30
Chirayu Desai 37016d2288 pixel/get-new-device-vars: 12L is 12.1
Change-Id: I895764f7df8f11197f659083a8726d24b88363d6
2022-03-09 01:22:20 +05:30
Chirayu Desai d3531d1af3 pixel/get-new-device-vars: Handle failure gracefully
Change-Id: Ia26addd1c68ac98e66d69f0933871be29dd2849a
2022-03-09 01:22:14 +05:30
Chirayu Desai b3b2146978 git-review: 12L
Change-Id: Ida6651ff9403a419ed75e28d0c7719996e1bc4b5
2022-03-09 01:21:08 +05:30
Chirayu Desai bf76c94d5d vars: Re-organize contents
* Split them up according to how they're set
  1. Set once and forget, such as firmware partitions
  2. Updated manually, build ID
  3. Updated automatically via script, other vars

* That way it's clearer what's ok to modify and what isn't

Change-Id: Idaf4bf99de44140e7e9c68c0c9e5c04c1ff60dd9
2022-03-07 13:42:12 -05:00
Chirayu Desai 5df0a00979 vars: Rename kernels to device_kernels
kernel_repos and kernels was confusing

Change-Id: I0a84448806608ab328386ebe2d193187d3cbd9ef
2022-03-07 13:42:12 -05:00
Chirayu Desai d484ef8bb3 vars: Add a new pixels
* Prepare for other devices
* Variable name kept the same intentionally to avoid extra script changes
* Don't see a need to import both pixels and devices, since devices includes pixels

Change-Id: I34391334188f7f52c49f2b9a7e7277292dfc15a6
2022-03-07 13:42:12 -05:00
Chirayu Desai f2ed320562 release/tag.sh: Add in a couple waits to allow verification before committing
* Good to verify manifest and repos before starting to tag
* Good to verify tags before starting to push since we consider them
  immutable

Change-Id: I7157b7527bbef3f33908cd50135f7dcacf9349be
2022-03-07 08:08:50 -05:00
Chirayu Desai bf6d298186 Pixel 6: February 2022 Security update, take two
Change-Id: I60a6482bf0a449d130e5b940401b3fd4d9e77529
2022-02-19 19:12:05 +05:30
Chirayu Desai 37fa0957a2 February 2022 Security update
Steps:
1. Edit build_id manually, based on
   https://developers.google.com/android/images
2. scripts/update-device-vars.sh
3. Update vars/common
4. Update kernel tags manually, based on what's pushed to
   kernel/msm and kernel/gs

Can also refer to: https://groups.google.com/g/android-building/c/ChjvrI4jGsU/m/2IDRYZiGBgAJ

Change-Id: Ibf322254226d280457b88f3b3c3418b6da7bf577
2022-02-08 14:31:11 +05:30
Chirayu Desai 3dfe22cdb4 Pixel: Add script to automatically upgrade build.prop overrides
Change-Id: Ic3d2026c2cc65532a5f1eed1ac7bc11aa5a0a6e1
2022-01-18 03:24:02 +05:30
Chirayu Desai 7a94d27d54 vars: Add prev_build_number and build_number
* Extracted from flash_url

Change-Id: Ie24d7b02d8717e965cd088d6e800291b6e6c0a63
2022-01-18 03:13:35 +05:30
Chirayu Desai c9b30f9f03 pixel: Save build_number to vars, extracted from flash_url
Change-Id: I8d6e97629f77136b4ce6fc003712cf8e73a891b4
2022-01-18 03:13:35 +05:30
Chirayu Desai 67a19d54a4 raviole: January 2022 Security update
Change-Id: I5c70d3e3a834c1819d65646f50b34aa8a866849b
2022-01-15 08:13:03 +05:30
Michael Bestas 2129e87f7a aosp-merger: Improve empty merge check
* Handles "Already up to date." merge being registered as "merge"
  instead of "nochange" in merged_repos.txt

Change-Id: I6e73013aa5c30a17f150a444b16365c39cf4280e
2022-01-15 08:13:03 +05:30
Chirayu Desai 55e0d91a9f pixel: Save build id to build_id.txt
After extract, this will let us do
source calyx/scripts/vars/devices
pushd vendor/google
for d in ${devices[@]}; do
   git -C ${d} add .
   git -C ${d} commit -m "${d}: $(cat ${d}/build_id.txt)"
done

Change-Id: I4de645726213f9c56ffbd41b9010e89a58c983ed
2022-01-14 23:20:27 +05:30
Chirayu Desai c6b02fa9c7 aosp-merger: push-merge: Print filename of the merged_repos.txt we're handling
* Good to have this just before we print the branch name and tag being pushed

Change-Id: Ie45d4a9bcf65ec18972d58e7b748190759e1f0cd
2022-01-12 16:18:05 -05:00
Chirayu Desai e6e4eaf315 aosp-merger: Implement kernel merging
Change-Id: I2dcc15ccf7d0a509880cd631435d1b8a1e07f5fb
2022-01-12 16:18:05 -05:00
Chirayu Desai ee62a5ef5b aosp-merger: remove merged_repos.txt early
* To be able to re-run the script cleanly

Change-Id: I7eb65bc5d7265d0b4d892cb5c2921a8bec02103c
2022-01-12 16:18:05 -05:00
Chirayu Desai 2efdea6eca aosp-merger: Implement device merging
Change-Id: Ic8872d6acd1d291398dfa97ee2fb930d33b0fe75
2022-01-12 16:18:05 -05:00
Chirayu Desai da257cbca9 aosp-merger: push-merge: Push new tag as well
* Helps in figuring out if a commit is in a particular tag on
  GitLab / GitHub

Change-Id: Ia62b706e02506dfcef6f676d8469b5a1de447295
2022-01-12 16:18:05 -05:00
Chirayu Desai a96a0eb1e3 aosp-merger: upload-squash: Use topic from a var
* For consistency, since there can be multiple tags for a month

Change-Id: I077649c2bc90613b6543187c969165d076f44b86
2022-01-12 16:18:05 -05:00
Chirayu Desai dc0e2a3ea7 carriersettings-extractor: Read CarrierSettings protobufs in stages
* Trying to load them all at once resulted in a game of chicken due
  to 'telenor_se' existing in both generic 'others.pb', and it's own
  'telenor_se.pb'
* We tried to work around that in multiple ways, and that did work,
  but let's just re-write this to be more deterministic, and generic.

Change-Id: Iac046b98d4c23667eff306861c902913785e6ca8
2022-01-12 02:34:40 +05:30
Luca Stefani d7c19b9074 carriersettings-extractor Update to 12
Import proto files from
tools/carrier_settings 0a2c3b9ec4337283b67391971613cd06690a2d34
packages/providers/TelephonyProvider e9b03419e34ed174e239453f958aac0f042bf072

Change-Id: Ied7c51623dc6d14352fbc30db4632311ba455a0e
2022-01-11 22:00:26 +05:30
Chirayu Desai 2db4321c92 Revert "carriersettings-extractor: "Fix" for 12"
This reverts commit 05f1aaadb2.

* This was never a real fix

Change-Id: I9c40e8a9fcfda2498f17f77b094051f35c53799b
2022-01-11 22:00:24 +05:30
Chirayu Desai 2cad0b644a vars: Re-do kernel vars, January 2022 Security update
* kernels are list of kernels we build
* kernel_repos are the various kernel manifests we have
* Each one of the above gets it's own var file with the tag
* devices just have kernel=name-above
* barbet is the only one with same device and kernel name

Change-Id: I3883db12dee4c13964d1950231575a6ce5939aab
2022-01-11 21:45:39 +05:30
Chirayu Desai a95348b8fc vars: pixels: January 2022 Security update
* Pixel 3, since it did get an update even if still on Oct patch
* Pixels 3a - 5, normal update
* Pixel 6 pending

Process:
* Update build id manually
* Run pixel/update-devices-vars.sh

Change-Id: Ic5370c72da670537864b7d926e8baf562ec20b9f
2022-01-11 21:45:39 +05:30
Michael Bestas b8540b308a
aosp-merger: Export LC_MESSAGES=C LC_TIME=C
* Ensure system locale doesn't affect git commit messages

Change-Id: I2bb458cd57efb7a9a41f08f1fc8beeb832789c79
2022-01-11 00:04:26 +02:00