Commit graph

82503 commits

Author SHA1 Message Date
Treehugger Robot
86fe086bb7 Merge "Change condition to match go/thirdpartylicenses" am: e6b226284d
Original change: https://android-review.googlesource.com/c/platform/build/+/2313302

Change-Id: Iec30026aafdae627a3fee8c20e51413fb26e240d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 22:42:20 +00:00
Treehugger Robot
e6b226284d Merge "Change condition to match go/thirdpartylicenses" 2022-11-30 22:10:50 +00:00
Bob Badour
cac8a3cf09 Change condition to match go/thirdpartylicenses
Policy uses restricted_if_statically_linked at
https://opensource.google/documentation/reference/thirdparty/licenses#RestrictedIfStaticallyLinked

Test: m droid
Change-Id: I9b18d3133ae72de1bede99f46b530298313bc2e6
2022-11-30 10:52:41 -08:00
Seth Moore
52295677f3 Merge "Add rkpd mainline module" am: dd026fce63
Original change: https://android-review.googlesource.com/c/platform/build/+/2307905

Change-Id: I8fdbea303b9912d09e174794ecb6842ee8057b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 22:38:33 +00:00
Seth Moore
dd026fce63 Merge "Add rkpd mainline module" 2022-11-28 22:02:35 +00:00
Treehugger Robot
e2a672954a Merge "Export all jdk.compiler packages for host tests" am: f9ff341481
Original change: https://android-review.googlesource.com/c/platform/build/+/2317256

Change-Id: I63128767c123a915ca361614d3a088c6472dcd06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25 15:17:20 +00:00
Treehugger Robot
f9ff341481 Merge "Export all jdk.compiler packages for host tests" 2022-11-25 14:48:53 +00:00
Sorin Basca
ab23a59c60 Export all jdk.compiler packages for host tests
Fixes: 260328928
Test: atest error_prone_android_framework_test:com.google.errorprone.bugpatterns.android.ContextUserIdCheckerTest#testDevicePolicyManager --host
Change-Id: I6ff2893b906c6b7584183a608b377ddd93132873
2022-11-25 11:17:57 +00:00
Sorin Basca
fc94c50721 Merge "Fix Java flags in TF template to work with JDK 17+" am: c87d15adb8
Original change: https://android-review.googlesource.com/c/platform/build/+/2313308

Change-Id: Ib78c80b1afd59cdea17fcb3a9b5d240e09a86104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 10:12:49 +00:00
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
bd703c3fa3 Merge "Fix the build system to pass "-Xgc:CMC" to dex2oat correctly." am: 8497cfd66e
Original change: https://android-review.googlesource.com/c/platform/build/+/2312212

Change-Id: I8337a911ef3a0710301ce072dd8e27e76abd3372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 15:28:27 +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
77de388407 Merge "Script for CI build target on *-finalization-1 branches." am: 7e34ad149f
Original change: https://android-review.googlesource.com/c/platform/build/+/2312807

Change-Id: Id0db3e194a449209d51a9291852bb7186b3b52b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 20:09:56 +00: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
90a4db9cf4 Merge "Determine whether to enable userfaultfd GC at build time." am: 092073607d
Original change: https://android-review.googlesource.com/c/platform/build/+/2304232

Change-Id: I309d6877894a3b37284d5f49b69c7b258614563e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 15:53:25 +00:00
Treehugger Robot
092073607d Merge "Determine whether to enable userfaultfd GC at build time." 2022-11-22 15:10:20 +00:00
Seth Moore
277a3f6f83 Add rkpd mainline module
Bug: 254112668
Test: It builds
Merged-In: Iacd7164d9fae68a622ad45467c2e4af2f0111468
Change-Id: Iacd7164d9fae68a622ad45467c2e4af2f0111468
2022-11-21 10:57:39 -08:00
Treehugger Robot
94f22d5c19 Merge "Export com.sun.tools.javac.api for IsolatedHostTest" am: 72d74e2abb
Original change: https://android-review.googlesource.com/c/platform/build/+/2304019

Change-Id: Iac9591800fc1eebed4aab2af732951b26ec37ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 15:40:39 +00:00
Treehugger Robot
72d74e2abb Merge "Export com.sun.tools.javac.api for IsolatedHostTest" 2022-11-21 15:05:53 +00:00
Treehugger Robot
8e24d06a40 Merge "envsetup: Add pygrep function to grep all python files" am: c5f135a5eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1512271

Change-Id: I508ef7aabfdbacf2997f8483362d72a3acec0275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 05:02:12 +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
edc01f79ee Merge "Add init_first_stage to riscv64" am: 1cea5a1239
Original change: https://android-review.googlesource.com/c/platform/build/+/2307211

Change-Id: I3349ada8abadcbd48076bf71e12a37d054a96fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 22:41:36 +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
3d81281f9c Merge "Move allocator-V1 entry" am: b2c0b2d6cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2305882

Change-Id: Ia27b13ba3762242c1e6e827da9c69ecf6e434e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 18:24:16 +00: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
d629795e71 Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system" am: 05cc591fff
Original change: https://android-review.googlesource.com/c/platform/build/+/2266264

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