Commit Graph

8527 Commits

Author SHA1 Message Date
Seth Moore
49b88e4171 Add rkpd mainline module
Bug: 254112668
Test: It builds
Change-Id: Iacd7164d9fae68a622ad45467c2e4af2f0111468
2022-11-18 15:28:21 -08:00
John Reck
572b5b3bfa Merge "IAllocator-V2" 2022-11-18 22:40:27 +00:00
Qiao Li
6dd8774d6c Merge "Delete federatedcompute boot jar in build branch" 2022-11-18 17:55:50 +00:00
John Reck
5c7f190fbc IAllocator-V2
Test: make
Change-Id: Ifa1ef1a91e7de94d5ad27c846d287d9bbacabd2a
2022-11-18 11:21:23 -05:00
Treehugger Robot
b531957c23 Merge "Add init_first_stage to riscv64" am: 1cea5a1239 am: edc01f79ee am: 72b63aa805
Original change: https://android-review.googlesource.com/c/platform/build/+/2307211

Change-Id: Ifa0cc8a0ba64da62aebcc1396467e20dbe932242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 23:32:21 +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
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
John Reck
51edbc88c9 Merge "Move allocator-V1 entry" 2022-11-17 16:53:37 +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
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
John Reck
ba2dfa88de Move allocator-V1 entry
Just a shuffle to avoid a merge conflict

Test: make
Change-Id: Id68e4ef3b38965c08c9b783d32ccc2aca342ed24
2022-11-16 20:06:24 -05:00
Nikita Ioffe
1c12e7f870 Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system" am: 05cc591fff am: d629795e71 am: 2ca4302f8e
Original change: https://android-review.googlesource.com/c/platform/build/+/2266264

Change-Id: Ic23093b42b7924d4f04a9e747baf399ed92e68c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:09:56 +00:00
Nikita Ioffe
c1b1104ef1 Unconditionally install com.android.virt APEX am: bb9d6db326 am: bc02a0cc4d am: cdf6f5160b
Original change: https://android-review.googlesource.com/c/platform/build/+/2268026

Change-Id: Ifadb457dfc99e98e7fc25a1787eb5595e149e2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:09:52 +00: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
Ben Murdoch
293d3adb03 Increase GF dynamic partition size to 8G
Bug: 235574341
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

(cherry picked from commit bb8e6f5b12)
Merged-In: Ib08ee42e76a91b1c61c1b870f890dba66ed61209
Change-Id: I6c3ef94f9f08f42bd1edd01ff740d00c8d870e33
2022-11-15 16:05:09 +00:00
Ben Murdoch
162d5e9de3 Merge "Increase GF dynamic partition size to 8G" am: 7bc6e3e89f am: ce26bb42d5 am: e34a024371
Original change: https://android-review.googlesource.com/c/platform/build/+/2300457

Change-Id: Ia7d98e52bad0d2b4f99a50d8bf73cf7a63c4f39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 12:38:07 +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
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
qiaoli
be7b50f0ca Delete federatedcompute boot jar in build branch
Test: TH
Bug: 253316936
Change-Id: Ia3add966bb3e5e9d750cf28441c3f5fc34312233
2022-11-15 07:18:51 +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
Treehugger Robot
9ca6680495 Merge "Add a ramdisk stub for targets that referred to goldfish's arm32.mk" am: 74d79e3284 am: fe150e2fa3 am: 78de2cd7df
Original change: https://android-review.googlesource.com/c/platform/build/+/2295643

Change-Id: I0b302cec7392f992c9cb24f7c4e4b41d5d9d19df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 13:45:26 +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
cf1aa1f741 Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am: 2a273f50d4 am: 845fd94a44 am: f33dd70bf7
Original change: https://android-review.googlesource.com/c/platform/build/+/2271940

Change-Id: I0f08e2e11b56f07c85191c4a9024d6493552519f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 21:24:22 +00: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
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
Treehugger Robot
28e5c5eb93 Merge "Add the path of GSI document in gsi_release.mk" am: 94c9b20f1d am: d64b523aa0 am: 1d690b805a
Original change: https://android-review.googlesource.com/c/platform/build/+/2287294

Change-Id: I6a5b36359c13094495261836a0f8ccd3f1276d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 02:38:17 +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
SzuWei Lin
2086575f6f Merge "Support system_dlkm in GSI" am: 576c382c78 am: 2f1130f31e am: 078555ac9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2287293

Change-Id: Ifc8d115dfa217355c2069c6721ccb0f5487a9774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 16:22:54 +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
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
8605443c99 Merge "Add libconnectivity_native to LLNDK" am: 542672d797 am: 92851a2a0f am: 576cb2e9a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2057370

Change-Id: Icdb0cf0cc5813637b681b01a061b8971149a6464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:40:54 +00: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
Colin Cross
a2d13276a5 Merge "aosp_riscv64: inherit from default products that don't break the build" am: 9091700e3d am: 7b7af991bc am: 4cd44cd64f
Original change: https://android-review.googlesource.com/c/platform/build/+/2287164

Change-Id: Iefb1fd9a12069742cc5cf6b3881aee388bbb966a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 03:46:19 +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
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
Treehugger Robot
c36a95f1a5 Merge "Add init.environ.rc to aosp_riscv64" am: 92716d2d59 am: 70869ab0f2 am: 01753b438a
Original change: https://android-review.googlesource.com/c/platform/build/+/2286573

Change-Id: I1f0a851b1c8b648d7ad228f1cb5037e05cbced23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 05:42:30 +00:00
Treehugger Robot
70869ab0f2 Merge "Add init.environ.rc to aosp_riscv64" am: 92716d2d59
Original change: https://android-review.googlesource.com/c/platform/build/+/2286573

Change-Id: I500b60ea9cf169cd06d8b4e4794a9c39f26fa198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 04:40:02 +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
Colin Cross
5057ab2347 Merge "Switch from init to init_system to match base_system.mk" am: e2137bae02 am: b67fdb4f94 am: 614681d032
Original change: https://android-review.googlesource.com/c/platform/build/+/2282796

Change-Id: If6f14010454fb3e027bdbf6913e52f5cd7f1e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 22:36:04 +00:00
Colin Cross
b67fdb4f94 Merge "Switch from init to init_system to match base_system.mk" am: e2137bae02
Original change: https://android-review.googlesource.com/c/platform/build/+/2282796

Change-Id: If6f65e0508cbbe93b9f006ba1738a92a7a6fa49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 21:36:00 +00:00
Steven Moreland
99e91c49e8 Merge "graphics.common V3 -> V4" 2022-11-02 21:21:29 +00:00
Colin Cross
2fc08445ac Switch from init to init_system to match base_system.mk
Using init instead of init_system causes a failure packaging
target-files.zip:
failed to find system in canned fs_config

Switching to init_system seems to fix it.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Ia2cf2ef1b85c2e63076f70132f2cce64828c5c93
2022-11-02 18:15:08 +00:00
Treehugger Robot
ba7bc4f4df Merge "Hack aosp_riscv64 config to fix m droid dist" am: 324ad55c0a am: 1fc32534d7 am: 73d4032ca5
Original change: https://android-review.googlesource.com/c/platform/build/+/2281222

Change-Id: I8d82aea9b9853eca5bbd5648846cd82a7b60f0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 04:38:49 +00:00