aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-26Version bump to aml_con_331413000 [core/build_id.mk]aml_con_331413000android13-mainline-conscrypt-releaseAndroid Build Coastguard Worker
Change-Id: I0b5c533fd67e0edf30452cafd9ae972bc9c24e72
2023-03-27Version bump to aml_con_331411010 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I79e0d78fa44379f3c0df441184fef455123665ba
2022-12-20Make change and version bump to aml_con_331411000 for mainline module file: Noneaml_con_331411000Android Build Coastguard Worker
Change-Id: I9a263ae09b655af50a360d56390a2d4a7d044db4
2022-12-16Make change and version bump to aml_con_331410000 for mainline module file: NoneAndroid Build Coastguard Worker
Change-Id: I9be89f87b61ea18427f9726b038ae37684fd8b8a
2022-12-13Merge "switch to use blkid_static" into tm-mainline-prodMridul Agarwal
2022-12-13switch to use blkid_staticDennis Shen
BUG: b/259003057, b/257933023 Change-Id: I967fc07a25d596aa40489df3f9636bfc94f0848d
2022-12-10[automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: ↵Steve Berbary
445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours am: 6a991a76ce -s ours am: 561c85919c -s ours am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I54f90a57b6af95e213ea1f5f0621c672a7fcf42e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: ↵Steve Berbary
445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours am: 6a991a76ce -s ours am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: Ied5a3e5d9625be31c285cefb6a0039dafb44067e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: ↵Steve Berbary
445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I191008fd08d7a37a64aa8f76fef401e742755c9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: ↵Steve Berbary
6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I106595aa928c539025299d229d193869eb77fbda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: ↵Steve Berbary
6b05071cb3 am: 23dae41cbc Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I980866984561c3daa4d31ffa91d743ccb6abae13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: ↵Steve Berbary
6b05071cb3 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I4fe31036b0ecebb5a6cfb8b4080e692e54e36068 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Update Security String to 2023-02-01 am: d0a709ffca am: 3b0b33502fSteve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20679823 Change-Id: I8a346a9d317157133f607fe002d4b7098ef8fc8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147Steve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I7e967462a1110696405c7ebd69d2faf624b5ef7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Update Security String to 2023-02-01 am: b601ce96dbSteve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910 Change-Id: I524f6521a7aa06e1cb27b5217486ab3141d2978b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Update Security String to 2023-02-01 am: d0a709ffcaSteve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20679823 Change-Id: I7037e652ebab3d41bae6dcfa780d2348884f1e09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08Update Security String to 2023-02-01Steve Berbary
Bug: 261738635 Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-07Update Security String to 2023-02-01Steve Berbary
Bug: 261738635 Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-05[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9323928-L96600000957618646 into mainline-conscrypt-release. Change-Id: I4655f2aa75227d071eadfb48c6d9af59efc68ec0
2022-12-05Version bump to aml_con_331115020 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I1506069318b8f46075984ebaf3f7b067febc38aa
2022-12-05[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9323928-L97700000957625091 into mainline-conscrypt-release. Change-Id: I76b121c9896c0bf5c310d02be189cfeb8c00fd2a
2022-12-05Version bump to aml_con_331115010 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I2eb94a4e721184005cf4f596d8ccf653bf73d87e
2022-11-23[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9290683-L84400000957481555 into mainline-conscrypt-release. Change-Id: Ie1b449e3b07b83850cb027ff0645ddd9b461f581
2022-11-23Version bump to aml_con_331115000 [core/build_id.mk]aml_con_331115000Android Build Coastguard Worker
Change-Id: I5554792e25591dfb366baf49f20acb9dfe91ee00
2022-11-17Support chained init_boot partition signing am: 425f7d1cb3Hongguang Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20486714 Change-Id: Ic81c0d6e149ca185c62c3173480275719cd5df85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16Merge "Update deapexer call to explictly use blkid" into tm-mainline-prodDennis Shen
2022-11-15Support chained init_boot partition signingHongguang Chen
Bug: 256048561 Bug: 256237041 Test: sign_target_files_apks -d certs --avb_init_boot_algorithm \ SHA256_RSA4096 --avb_init_boot_key init_boot_rsa4096.pem \ xxx.zip signed.zip (Check signed.zip/META/misc_info.txt) Change-Id: I65fc7913089ae318d90df55a533d3e2ebd93b029 (cherry picked from commit 0d6b727e03efd49a77e864077a01837e993f600f) Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029 (cherry picked from commit acf1b3afe28f03a4816575960c9e903293a80d76)
2022-11-15[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9283435-L68500000957385178 into mainline-conscrypt-release. Change-Id: I287753c95b3e17e6f5ede86ee4f6d154362f77ae
2022-11-15Version bump to aml_con_331210000 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: Ie90b139b40fbce54e559f2f4bf577219fd4937ab
2022-11-14[automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: ↵Steve Berbary
404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours am: 149efcc09a -s ours am: 2acb9f7049 -s ours am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: I04a504a26d7beed067c7dc6d0b15d2e2f1997414 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14[automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: ↵Steve Berbary
404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours am: 149efcc09a -s ours am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: I1cfb6b99f09e11860ba8b2f11296b9c5673a726a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14[automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: ↵Steve Berbary
404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: Iece135709b1ebef6311749ed0d4b986cdf72e0bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: ↵Steve Berbary
a436638431 am: f1cdafb8f3 am: 6ed124904e Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: Ib0e3df96717b5079645139ef7ab5e816cc6a3a39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: ↵Steve Berbary
a436638431 am: f1cdafb8f3 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: I2a952f5842e16551e171eabf2f51082805e7383b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: ↵Steve Berbary
a436638431 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: Id358b18b9f7324af0e5a434f9f8f304e1ac09da4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Version bump to aml_con_331114000 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I0b5a309898a18532d466b17d0f9aceb1c21eeddc
2022-11-14Update Security String to 2023-01-01 am: 26c214ebb8 am: d80639db53Steve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20455773 Change-Id: I899298d7101bc5cfac9d124ce18a663de3e2a749 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1Steve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: Ib124bfdfa12cf7a84d20828271443f64cf339e2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Version bump to aml_con_331113000 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I39547a57d9cda8f8477e863c67da6b2cf427fdf3
2022-11-14Update Security String to 2023-01-01 am: 31bb5f4be2Steve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265 Change-Id: Id370b73b62a02712ebecddc0c64f84010b877831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Update Security String to 2023-01-01 am: 26c214ebb8Steve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20455773 Change-Id: I6ee4a90fa01ca59fea7e1b9aacb4255442117fce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14Update deapexer call to explictly use blkidDennis Shen
To support erofs apex extract via deapexer, we need blkid to tell the filesystem type of underlying payload image. If it is ext4, debugfs_static will be used, if it is erofs, then we should use fsck.erofs. Thus we now need explicit blkid input. Also, remove dependency on fsck.erofs for other deapexer calls. Only extract deapexer call needs blkid and fsck.erofs. BUG: b/255963179, b/240288941 Change-Id: I8cea0f2def664f9cabf8b14c9a7ecc47bbddfbdd (cherry picked from commit a8d1143beb13a9f3cbe802d626d7eb9b12fbdc5e)
2022-11-12Update Security String to 2023-01-01Steve Berbary
Bug: 258811679 Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 Merged-In: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
2022-11-11[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9161290-L36500000957321660 into mainline-conscrypt-release. Change-Id: I3a1ff9ac316787e162bf13bdf0ddfc8c516eed79
2022-11-11Version bump to aml_con_331011100 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I0cfcb114f7730593ccc614598bad612059c70434
2022-11-11Update Security String to 2023-01-01Steve Berbary
Bug: 258811679 Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 Merged-In: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
2022-11-10Make change and version bump to aml_con_331312000 for mainline module file: Noneaml_con_331312000Android Build Coastguard Worker
Change-Id: Ieea46dc2232166e9cc4b07ab4c271cbf1a4153a8
2022-11-08Version bump to aml_con_331311000 [core/build_id.mk]Android Build Coastguard Worker
Change-Id: I5e440119fbe4a751aa596d04696ca5da698b4803
2022-11-08Add missing fsck.erofs and blkid to OTATOOLSDennis Shen
cherry pick of aosp/2290117 BUG: b/257882042 Merged-In: I9821106d45fa6c66f7482be2d0cdd605fe61706f Change-Id: I36403f5078890f7b580f5e4e9eb9fc2dabe1b782
2022-11-03Make change and version bump to aml_con_331310000 for mainline module file: NoneAndroid Build Coastguard Worker
Change-Id: I40e7785cf3421e72cabdd0595db99e6e4762ec52