Commit graph

80800 commits

Author SHA1 Message Date
Sorin Basca
c87d15adb8 Merge "Fix Java flags in TF template to work with JDK 17+" 2022-11-24 09:28:37 +00:00
Treehugger Robot
8497cfd66e Merge "Fix the build system to pass "-Xgc:CMC" to dex2oat correctly." 2022-11-23 14:54:00 +00:00
Jiakai Zhang
4a30e138e2 Fix the build system to pass "-Xgc:CMC" to dex2oat correctly.
Bug: 242553398
Test: -
  1. lunch aosp_oriole-userdebug
  2. m
  3. Don't see "--runtime-arg -Xgc:CMC" in .invocation files.
Test: -
  1. lunch aosp_oriole-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=true m
  3. See "--runtime-arg -Xgc:CMC" in .invocation files.
Change-Id: If1c2c5feecc8148a0e2fa6a0e0b23641945f5b1d
2022-11-23 11:28:20 +00:00
Hadrien Zalek
6053ac1816 Fix Java flags in TF template to work with JDK 17+
Isolated TF tests are failing since the `--add-exports` option cannot be
parsed by JDK 17+ due to a missing '<target-module>' component. This
change resolves the issue by adjusting the options in the TF template to
export the source package to all unnamed modules.

See
https://docs.oracle.com/javase/9/migrate/toc.htm#JSMIG-GUID-2F61F3A9-0979-46A4-8B49-325BA0EE8B66
for more information.

Test: atest --host HelloWorldHostTest
Change-Id: Iccb8a8dcd3707237e018d6feb6b6a0e8d2bc9a86
2022-11-22 15:40:26 -08:00
Treehugger Robot
7e34ad149f Merge "Script for CI build target on *-finalization-1 branches." 2022-11-22 19:32:23 +00:00
Alex Buynytskyy
e5aeeb9769 Script for CI build target on *-finalization-1 branches.
Revert the previous script changes, run the finalization, and then the
build.
Useful to cross check the broken branch - do we just need to re-run the
script, or is there a bigger problem.

Bug: 243966946
Test: run locally
Change-Id: I44d6a5f5f523001ae70e5b82315ffbad82a1233d
2022-11-22 16:43:00 +00:00
Treehugger Robot
092073607d Merge "Determine whether to enable userfaultfd GC at build time." 2022-11-22 15:10:20 +00:00
Treehugger Robot
72d74e2abb Merge "Export com.sun.tools.javac.api for IsolatedHostTest" 2022-11-21 15:05:53 +00:00
Treehugger Robot
c5f135a5eb Merge "envsetup: Add pygrep function to grep all python files" 2022-11-18 04:38:51 +00:00
Treehugger Robot
1cea5a1239 Merge "Add init_first_stage to riscv64" 2022-11-17 22:12:02 +00:00
Colin Cross
2c102533b5 Add init_first_stage to riscv64
aosp_riscv64 doesn't use base-system.mk yet, add init_first_stage
to the ramdisk manually.

Test: lunch aosp_riscv64-userdebug && m out/target/product/generic_riscv64/ramdisk.img
Change-Id: I148e436b34e8900815eb8dac42a6c1f5251f824d
2022-11-17 10:51:31 -08:00
Treehugger Robot
b2c0b2d6cd Merge "Move allocator-V1 entry" 2022-11-17 18:00:58 +00:00
Jiakai Zhang
d6c6e3a9f3 Determine whether to enable userfaultfd GC at build time.
This is determined by:
- a product config flag
- the vendor API level

It is then passed to the device as a system property
"ro.dalvik.vm.enable_uffd_gc".

This change is a no-op change. It doesn't enable userfaultfd GC by
default. OVERRIDE_ENABLE_UFFD_GC=default can be passed to the build
system to enable userfaultfd GC for testing purposes.

Bug: 242553398
Test: -
  1. lunch aosp_redfin-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=default build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "false" in the output
Test: -
  1. lunch aosp_oriole-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=default build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "true" in the output
Test: -
  1. lunch aosp_redfin-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=true build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "true" in the output
Test: -
  1. lunch aosp_oriole-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=false build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "false" in the output
Change-Id: Ifd6e6cddb502315912ff949619a5b526ae0d73ff
2022-11-17 16:33:44 +00:00
Sorin Basca
0801b18080 Export com.sun.tools.javac.api for IsolatedHostTest
Bug: 233029164
Test: TH
Change-Id: I051c842d2bbf50764e7e6f4764e22f7a5c989336
2022-11-17 11:18:44 +00:00
John Reck
8244fb3b1e Move allocator-V1 entry
Just a shuffle to avoid a merge conflict

Test: make
Merged-In: Id68e4ef3b38965c08c9b783d32ccc2aca342ed24
Change-Id: Ia7945144227cb7c23e727a4c490d443ba28b9abf
2022-11-16 20:07:46 -05:00
Nikita Ioffe
05cc591fff Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system"
* changes:
  Add framework-virtualization to PRODUCT_APEX_BOOT_JARS
  Unconditionally install com.android.virt APEX
2022-11-16 08:49:36 +00:00
Treehugger Robot
9e0472e9c7 Merge "Fix recovery OTA error on merged targets" 2022-11-15 18:33:53 +00:00
Ben Murdoch
7bc6e3e89f Merge "Increase GF dynamic partition size to 8G" 2022-11-15 11:47:11 +00:00
Nikita Ioffe
74ab6e95c9 Add framework-virtualization to PRODUCT_APEX_BOOT_JARS
Bug: 243512044
Test: build & flash oriole
Test: build & flash redfin
Change-Id: I8554d2b0ccdb217b764dc52381e047104d720aec
2022-11-15 08:45:25 +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
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
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
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