Commit graph

82467 commits

Author SHA1 Message Date
Nikita Ioffe
bc02a0cc4d Unconditionally install com.android.virt APEX am: bb9d6db326
Original change: https://android-review.googlesource.com/c/platform/build/+/2268026

Change-Id: I0fc2e66015161bd1c20405bf447654b86dae77d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 09:08:04 +00:00
Treehugger Robot
9f7c2f931b Merge "Fix recovery OTA error on merged targets" am: 9e0472e9c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2295638

Change-Id: I012b00e4ab756cfcc1b16e4d660db495cc41e310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 19:11:35 +00:00
Treehugger Robot
9e0472e9c7 Merge "Fix recovery OTA error on merged targets" 2022-11-15 18:33:53 +00:00
Ben Murdoch
ce26bb42d5 Merge "Increase GF dynamic partition size to 8G" am: 7bc6e3e89f
Original change: https://android-review.googlesource.com/c/platform/build/+/2300457

Change-Id: I4e08d59554d3fa8bfd801a740e29fb2720f76488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 12:01:37 +00:00
Ben Murdoch
7bc6e3e89f Merge "Increase GF dynamic partition size to 8G" 2022-11-15 11:47:11 +00:00
Nikita Ioffe
bb9d6db326 Unconditionally install com.android.virt APEX
The change in the packages/modules/Virtualization in the same topic
takes care for defining the right variant of the APEX to be installed:

* Devices with AVF support will get the full com.android.virt APEX
* Devices without AVF support will get an almost empty version that only
  contains an app that defines AVF-related permissions, and soon the BCP
  fragment jar.

Bug: 243512044
Test: build & flash oriole
Test: build & flash redfin
Change-Id: I2c38e03529a77dd2820212812433741725115ce0
2022-11-15 08:40:11 +00:00
Colin Cross
826d2cc7a1 Merge "Add basic musl support to make" am: 15b02bd17d
Original change: https://android-review.googlesource.com/c/platform/build/+/2296060

Change-Id: Ib5a64890b52650cb31b269d90fb75046d67cfb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 02:05:55 +00:00
Colin Cross
15b02bd17d Merge "Add basic musl support to make" 2022-11-15 01:39:37 +00:00
Steven Moreland
98f6acfdbe Merge "clearer VNDK deprecation warning" am: 7130f45d94
Original change: https://android-review.googlesource.com/c/platform/build/+/2299741

Change-Id: Id3fb84de6eaa9cbd5d5b2540d7567c6774058cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 20:38:40 +00:00
Steven Moreland
7130f45d94 Merge "clearer VNDK deprecation warning" 2022-11-14 20:02:05 +00:00
Treehugger Robot
39a7a968e0 Merge "Fix 'expected str instance, bytes found' error when compute patches" am: 5cf8eef25e
Original change: https://android-review.googlesource.com/c/platform/build/+/2298037

Change-Id: Icac2e62e086e40390f8dc8a04d6dbbba6c3ac0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:50:33 +00:00
Treehugger Robot
5cf8eef25e Merge "Fix 'expected str instance, bytes found' error when compute patches" 2022-11-14 19:14:22 +00:00
Ben Murdoch
bb8e6f5b12 Increase GF dynamic partition size to 8G
Bug: 258783815
Test: $ lunch sdk_phone64_x86_64-userdebug; m
      $ ls -l $OUT/super.img - check 8G
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
Change-Id: Ib08ee42e76a91b1c61c1b870f890dba66ed61209
2022-11-14 17:15:22 +00:00
Steven Moreland
4db1ffa24a clearer VNDK deprecation warning
Bug: 122954981
Change-Id: If629256f1c1b13d3d11c50fe77bfbab1f316dd7a
Test: N/A
2022-11-12 01:39:55 +00:00
luoqiangwei1
3e3456bb72 Fix 'expected str instance, bytes found' error when compute patches
When building an incremental OTA package, if the compress_target=True
parameter is passed in when calculating a block, an exception will occur
in the subsequent join operation.

The reason is that Python 3 no longer allows str type join bytes type.

Bug: None
Test: Build Incremental OTA package

Change-Id: I6d556f9905b7ab75b70d3785334d71d5a6e5479b
Signed-off-by: luoqiangwei1 <luoqiangwei1@xiaomi.com>
2022-11-11 00:26:19 +08:00
Ibrahim Kanouche
f209e68684 Merge "Optimized project selection for getProjectMetadata" am: f0c6cf501c
Original change: https://android-review.googlesource.com/c/platform/build/+/2283396

Change-Id: I172e6401ebb4b10ccc0dca7a0d859a0ca1dce5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 15:41:33 +00:00
Ibrahim Kanouche
f0c6cf501c Merge "Optimized project selection for getProjectMetadata" 2022-11-10 15:28:12 +00:00
Dennis Shen
d68cb26e8c Merge "Update deapexer call to explictly use blkid" am: da42e6fedb
Original change: https://android-review.googlesource.com/c/platform/build/+/2290120

Change-Id: Iaafb5c40ad9fd85b19ae9afb83dbfa14bcfe12c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 15:26:32 +00:00
Dennis Shen
da42e6fedb Merge "Update deapexer call to explictly use blkid" 2022-11-10 14:48:41 +00:00
Treehugger Robot
fe150e2fa3 Merge "Add a ramdisk stub for targets that referred to goldfish's arm32.mk" am: 74d79e3284
Original change: https://android-review.googlesource.com/c/platform/build/+/2295643

Change-Id: I9616bf9c6a98128a4ebc8ff8a90cd8a34f5178ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 08:18:00 +00:00
Treehugger Robot
74d79e3284 Merge "Add a ramdisk stub for targets that referred to goldfish's arm32.mk" 2022-11-10 07:26:54 +00:00
Treehugger Robot
c7c2dde523 Merge "Fix crash in check_elf_file.py" am: ecf75cd30e
Original change: https://android-review.googlesource.com/c/platform/build/+/2296277

Change-Id: Id3216317260134293ab54cdc9be4b09278ce8ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 01:17:35 +00:00
Treehugger Robot
ecf75cd30e Merge "Fix crash in check_elf_file.py" 2022-11-10 00:41:32 +00:00
Colin Cross
af7ac3986e Add basic musl support to make
There are still devices that set BUILD_BROKEN_USES_BUILD_HOST_* and
build host modules in Make.  Add basic support for building against
libc_musl in Make when USE_HOST_MUSL is set.

Bug: 258535366
Test: build a host tool defined in Android.mk file in internal branch
Change-Id: I9150be749bbeaac2ac5a33b2cf915004aa3033df
2022-11-09 16:40:25 -08:00
Bill Yi
98db1435ae [automerger skipped] Merge "Merge TP1A.221105.002 to aosp-master - DO NOT MERGE" am: f6c2557070 -s ours
am skip reason: Merged-In I760ad49579961037628fde4d0300644aa2f6c188 with SHA-1 ca13cf7375 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2292626

Change-Id: Id23510a4cd54b57414abc4564cb42ad027e146b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 23:09:21 +00:00
Bill Yi
372dd02f5f [automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: fafba401d3 -s ours
am skip reason: Merged-In I760ad49579961037628fde4d0300644aa2f6c188 with SHA-1 ca13cf7375 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2292626

Change-Id: If5389062deb8601049164b68fec515cb466efcbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 23:09:07 +00:00
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
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
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