Bill Yi
f6c2557070
Merge "Merge TP1A.221105.002 to aosp-master - DO NOT MERGE"
2022-11-09 22:54:28 +00:00
Kelvin Zhang
fa40c04cba
Fix recovery OTA error on merged targets
...
Currently, when merging target files, system side's update_engine
version info is copied into the merged target_files. This causes
recovery OTA failure, because update_engine_sideload daemon in recovery
is from vendor side. To fix it, use the older version of update_engine
config when merging target files.
Test: th
Bug: 257426678
Change-Id: I5d3304366749995c99a61ca0645a22ee047f1465
2022-11-09 14:43:17 -08:00
Treehugger Robot
845fd94a44
Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am: 2a273f50d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2271940
Change-Id: Ib7accf4c713acf57c9ea193c0539d6cb28e3edef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 20:52:27 +00:00
Cole Faust
7a48527b95
Fix crash in check_elf_file.py
...
`lib` is already a string and doesn't need to be decoded.
Bug: 258395719
Test: On internal master: build/soong/soong_ui.bash --make-mode --bazel-mode-staging TARGET_PRODUCT=aosp_coral TARGET_BUILD_VARIANT=userdebug droid dist device-tests platform_tests
Change-Id: I83ff35339bea9f01c61d953e251788e0894005dc
2022-11-09 12:50:35 -08:00
Roman Kiryanov
d9682377fe
Add a ramdisk stub for targets that referred to goldfish's arm32.mk
...
there is a check that requires the ramdisk to be nonempty.
Bug: 250696437
Test: presubmit
Change-Id: If3918ec1eb0e6263ed845e48c7415755c0cfc832
Signed-off-by: Roman Kiryanov <rkir@google.com>
2022-11-09 12:24:16 -08:00
Treehugger Robot
2a273f50d4
Merge "Remove references to device/generic/goldfish/arm32-vendor.mk"
2022-11-09 19:52:36 +00:00
Android Build Coastguard Worker
4f31952f88
[coastguard skipped] Merge sparse cherrypicks from sparse-9271238-L05800000957295053 into tm-qpr1-release.
...
Change-Id: I8264b0b429e1a0060f04f80dca2e8334abdc05d5
2022-11-09 18:29:12 +00:00
Android Build Coastguard Worker
b8fb61a692
Make change and version bump to TQ1A.221205.011.A2
...
Change-Id: Ia87b424d8c9529c30d5c8a20d6c6374fb656b307
2022-11-09 18:26:44 +00:00
Steve Berbary
cb105c8022
Update Security String to 2022-12-01
...
Bug: 250644806
Change-Id: I79e50fe61a3b5c4c269625113802db578525fb26
(cherry picked from commit a94ddc8f0e5ce5dad63f0832301ef1513f149939)
Merged-In: I79e50fe61a3b5c4c269625113802db578525fb26
2022-11-09 18:26:36 +00:00
Dennis Shen
a8d1143beb
Update deapexer call to explictly use blkid
...
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
2022-11-09 18:22:14 +00:00
Bill Yi
fafba401d3
Merge TP1A.221105.002 to aosp-master - DO NOT MERGE
...
Merged-In: I760ad49579961037628fde4d0300644aa2f6c188
Merged-In: I4e94edbf42259eedb96e46d85b46c2d336f59d75
Merged-In: I4e94edbf42259eedb96e46d85b46c2d336f59d75
Change-Id: I453b1617db1973432e2745718ec3e3c86cd933e6
2022-11-08 22:26:15 -08:00
Android Build Coastguard Worker
11437177c3
[coastguard skipped] Merge sparse cherrypicks from sparse-9244662-L14000000957281586 into tm-qpr1-release.
...
Change-Id: Icfaa8415fdf2fd198c6258c7e8a030fda3a2a867
2022-11-09 05:51:29 +00:00
Android Build Coastguard Worker
c711789164
Version bump to TQ1A.221205.011.A1 [core/build_id.mk]
...
Change-Id: I22ea89610c566c3a485eb1fe504d88bc456de081
2022-11-09 05:46:28 +00:00
Treehugger Robot
2904184117
Merge "Use full command instead of local alias." am: afeadc3561
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2293482
Change-Id: I276aad13484e9a3bcf4697089d92854232eaede3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 02:47:08 +00:00
Treehugger Robot
afeadc3561
Merge "Use full command instead of local alias."
2022-11-09 02:16:26 +00:00
Treehugger Robot
a0dd90b844
Merge "finalize_branch_for_release: Don't build droidcore" am: 072fb49b17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2293481
Change-Id: I8644948372f215517cb223c53d6e0ff42832420a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 00:47:42 +00:00
Treehugger Robot
072fb49b17
Merge "finalize_branch_for_release: Don't build droidcore"
2022-11-09 00:18:27 +00:00
Alex Buynytskyy
9fa8d9d5c5
Use full command instead of local alias.
...
Bug: 243966946
Test: local
Change-Id: I99b75cb8f9d35ba6615f27adc5dd0c10a47edaac
2022-11-08 15:21:31 -08:00
Devin Moore
e311880f6a
finalize_branch_for_release: Don't build droidcore
...
'm droidcore' doesn't reproduce the same issues as `m`
Test: ./finalize_branch_for_release.sh
Bug: 258050166
Change-Id: I19efb49e6ece3f73010f757ebed0f0503698daed
2022-11-08 21:32:26 +00:00
Treehugger Robot
ca13cf7375
Merge "Document changes to soong config string variables" am: 56a6905d86
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2290344
Change-Id: I760ad49579961037628fde4d0300644aa2f6c188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:17:44 +00:00
Treehugger Robot
56a6905d86
Merge "Document changes to soong config string variables"
2022-11-08 04:53:52 +00:00
Treehugger Robot
4ddb4d587c
Merge "Support chained init_boot partition signing" am: 8f6474af5a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2289892
Change-Id: I669880931e2b2f162c840ac441810fb88f8fa09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 03:20:43 +00:00
Treehugger Robot
8f6474af5a
Merge "Support chained init_boot partition signing"
2022-11-08 02:41:53 +00:00
Cole Faust
cb30a801c5
Document changes to soong config string variables
...
Bug: 220375749
Test: N/A
Change-Id: Ie7a621eec40488ef63f74d70a91dc5849de2f90a
2022-11-07 17:52:28 -08:00
Treehugger Robot
ca0a2cd4f1
Merge "Add missing fsck.erofs and blkid to OTATOOLS" am: 3c4548087e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2290117
Change-Id: Ibe0eee0675ba05d6767433daa0f6f60178f7f263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 01:38:53 +00:00
Treehugger Robot
d64b523aa0
Merge "Add the path of GSI document in gsi_release.mk" am: 94c9b20f1d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2287294
Change-Id: Ie2ac870948098eb5a82ba113faae4041e4342a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 01:38:27 +00:00
Treehugger Robot
3c4548087e
Merge "Add missing fsck.erofs and blkid to OTATOOLS"
2022-11-08 01:23:13 +00:00
Treehugger Robot
94c9b20f1d
Merge "Add the path of GSI document in gsi_release.mk"
2022-11-08 01:05:12 +00:00
Hongguang Chen
0d6b727e03
Support chained init_boot partition signing
...
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
2022-11-07 15:48:23 -08:00
Dennis Shen
ae9b1f1c70
Merge "add EROFS apex support." am: 2e62ca1a68
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2290115
Change-Id: Ia23bf23d382ffff5bc58ace4146e049fee7a3c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 20:45:24 +00:00
Treehugger Robot
3c83bc5c2c
Merge "Only revert until the latest baseline." am: fbb395442c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2289886
Change-Id: I3b8c6562e538086f48a81c10a6b309ed1f43b65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 20:45:08 +00:00
Dennis Shen
2e62ca1a68
Merge "add EROFS apex support."
2022-11-07 20:40:55 +00:00
Dennis Shen
f58e548943
add EROFS apex support.
...
Signing code uses deapexer to expand payload image, deapexer currently
only supports ext4 payload image expansion using debugfs or
debugfs_static. To support EROFS, need to supply deapexer with
fsck.erofs native binary for EROFS payload expansion.
cherrypick of ag/20154950BUG: b/195515562, b/240288941
Change-Id: Ibf707989f2502bfcf112202a3a6fdb74b6a8dbbc
2022-11-07 20:40:41 +00:00
Treehugger Robot
fbb395442c
Merge "Only revert until the latest baseline."
2022-11-07 20:21:27 +00:00
Dennis Shen
888539c4c8
Add missing fsck.erofs and blkid to OTATOOLS
...
BUG: b/257882042
Change-Id: I9821106d45fa6c66f7482be2d0cdd605fe61706f
2022-11-07 18:56:47 +00:00
Alex Buynytskyy
8361b3a13f
Only revert until the latest baseline.
...
Bug: 243966946
Test: run locally
Change-Id: I1d64054cd4beab1fd737cbc5fc47879f3c6ff21a
2022-11-07 17:33:17 +00:00
SzuWei Lin
2f1130f31e
Merge "Support system_dlkm in GSI" am: 576c382c78
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2287293
Change-Id: I58467ca9d18848b65ce5dd764ab137bc730216a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 14:51:38 +00:00
SzuWei Lin
576c382c78
Merge "Support system_dlkm in GSI"
2022-11-07 14:15:21 +00:00
Islam Elbanna
a8c84ad568
Merge "Zip apex system server and standalone system server jars into system_server.zip." am: 4fbebb6d9d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2287335
Change-Id: I605ab1aea0b3b9c09dd7a5ed32eb6150cc0590e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 12:06:42 +00:00
Islam Elbanna
4fbebb6d9d
Merge "Zip apex system server and standalone system server jars into system_server.zip."
2022-11-07 11:40:52 +00:00
SzuWei Lin
8521eca84e
Add the path of GSI document in gsi_release.mk
...
Documents for GSI specific packages can be found at
device/generic/common/README.md.
Bug: 256984997
Test: TH
Change-Id: I62bfeea292050773c9d12cd753357dda836b07b0
2022-11-07 18:13:44 +08:00
SzuWei Lin
1c31b049c9
Support system_dlkm in GSI
...
From Android 13, all devices must include a system_dlkm partition.
The patch enables system_dlkm on all GSI targets to support the devices
with system_dlkm partition, and be compatible with old devices
without a system_dlkm partition.
With patch, there is no /system/system_dlkm, and add a symlink
/system/lib/modules -> /system_dlkm/lib/modules
Bug: 256984997
Test: make gsi_arm64-user and aosp_arm64-user; check system folder
Change-Id: I2453ec43d584423cc4d5f0e23405f0ae9b6c5c90
2022-11-07 18:13:31 +08:00
Remi NGUYEN VAN
92851a2a0f
Merge "Add libconnectivity_native to LLNDK" am: 542672d797
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2057370
Change-Id: If0aa00cc386e31e0004083bd1109fc52ab8a1aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:08:30 +00:00
Remi NGUYEN VAN
542672d797
Merge "Add libconnectivity_native to LLNDK"
2022-11-07 02:07:45 +00:00
Treehugger Robot
f8b7826c59
Merge "Convert soong_to_convert.py to python 3" am: e32ad5e482
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2288542
Change-Id: I4eda08308a76a034161fc804dd4c165dbfee723b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 04:14:23 +00:00
Treehugger Robot
e32ad5e482
Merge "Convert soong_to_convert.py to python 3"
2022-11-05 03:34:03 +00:00
Colin Cross
7b7af991bc
Merge "aosp_riscv64: inherit from default products that don't break the build" am: 9091700e3d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2287164
Change-Id: Ifb94b5e25e2d1cadef2e73379217326282775dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 01:15:15 +00:00
Cole Faust
5865420eb1
Convert soong_to_convert.py to python 3
...
Bug: 203436762
Test: m out/target/product/emulator_x86_64/soong_to_convert.txt
Change-Id: Ibf8d80a160315ed03a11fbeef66a630b224bea0a
2022-11-04 17:36:13 -07:00
Colin Cross
9091700e3d
Merge "aosp_riscv64: inherit from default products that don't break the build"
2022-11-05 00:30:05 +00:00
Kevin Dagostino
db929e2933
Merge "export tradefed .xml templates for tests" am: d1e43a8d7c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2282245
Change-Id: I252145a53318e8f52732b5ded93086f645a9a6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 20:11:59 +00:00