Commit graph

80779 commits

Author SHA1 Message Date
Ben Murdoch
7bc6e3e89f Merge "Increase GF dynamic partition size to 8G" 2022-11-15 11:47:11 +00:00
Colin Cross
15b02bd17d Merge "Add basic musl support to make" 2022-11-15 01:39:37 +00:00
Steven Moreland
7130f45d94 Merge "clearer VNDK deprecation warning" 2022-11-14 20:02:05 +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
f0c6cf501c Merge "Optimized project selection for getProjectMetadata" 2022-11-10 15:28:12 +00:00
Dennis Shen
da42e6fedb Merge "Update deapexer call to explictly use blkid" 2022-11-10 14:48:41 +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
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
f6c2557070 Merge "Merge TP1A.221105.002 to aosp-master - DO NOT MERGE" 2022-11-09 22:54:28 +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
afeadc3561 Merge "Use full command instead of local alias." 2022-11-09 02:16:26 +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
56a6905d86 Merge "Document changes to soong config string variables" 2022-11-08 04:53:52 +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
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
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
576c382c78 Merge "Support system_dlkm in GSI" 2022-11-07 14:15:21 +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
542672d797 Merge "Add libconnectivity_native to LLNDK" 2022-11-07 02:07:45 +00:00
Treehugger Robot
e32ad5e482 Merge "Convert soong_to_convert.py to python 3" 2022-11-05 03:34:03 +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
d1e43a8d7c Merge "export tradefed .xml templates for tests" 2022-11-04 19:40:20 +00:00
Colin Cross
dd9e1e40a3 aosp_riscv64: inherit from default products that don't break the build
Uncomment everything in aosp_riscv64.mk that doesn't break the
aosp_riscv64-userdebug build.

Test: m droid dist
Change-Id: I29b07d74fb8e93848bd422287e9cfaa32bde6d93
2022-11-04 17:25:54 +00:00
Bob Badour
8eeff2b0b8 Merge "Fix final nits from noticeindex change." 2022-11-04 16:57:01 +00:00
Islam Elbanna
ab52f4baaa Zip apex system server and standalone system server jars into system_server.zip.
Currently, the Art benchmark service is depending on the boot.zip file
to filter out boot image profiles based on the existing jars in this zip
file, and to expand profiling to apex system server jars and standalone
jars we need to export these jars in another zip file.

Bug: 241823638
Test: Checked the generated `system_server.zip` using `m droidcore dist`
Test: Checked with aosp and internal targets
Change-Id: I477dcfd3381bd24bdc50aabb773b38f8840f0ce0
2022-11-04 15:52:37 +00:00
Treehugger Robot
92716d2d59 Merge "Add init.environ.rc to aosp_riscv64" 2022-11-04 04:03:13 +00:00
Colin Cross
ceca93acb0 Add init.environ.rc to aosp_riscv64
init.environ.rc has a postinstall command to create the symlinks in
and directories in the root filesystem.  Without those packaging
target-files.zip fails with:
failed to find system in canned fs_config

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m installclean && m droid dist
Change-Id: Iccb6ba53a3caa918431119230256a01d4919f1cc
2022-11-04 00:22:26 +00:00
Dennis Shen
1c1a075006 Merge "Update deapexer extract call with more input" 2022-11-03 22:54:49 +00:00
Treehugger Robot
b6bb694958 Merge "Use 'ours' conflict resolution strategy." 2022-11-03 22:32:31 +00:00
Alex Buynytskyy
92f501aef7 Use 'ours' conflict resolution strategy.
We should never use anything from finalization commits.

Bug: 243966946
Test: run locally
Change-Id: I4b0cedd7e82362cc98961e627d0103cfba18fc6d
2022-11-03 12:29:06 -07:00