Commit Graph

8432 Commits

Author SHA1 Message Date
Xin Li
3cdf392f61 Merge Android 13 QPR1
Bug: 261731544
Merged-In: Idccbf36672703b1e9a6b27bf117459284bc7ed26
Change-Id: I3c0651138a35d0ec3289be1b0e6873bba57593b4
2022-12-09 10:23:02 -08:00
Steven Moreland
c367b14b8e Merge "graphics.common V3 -> V4" into tm-qpr-dev-plus-aosp 2022-12-08 18:53:32 +00:00
Marc Kassis
1b308a4002 graphics.common V3 -> V4
Bug: 251177105
Test: m
Change-Id: I0d03ff56140843cfec9e6f37672a8b3f8e298c2a
Merged-In: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598
2022-12-07 08:34:29 +00:00
Louis Chang
fd3709738d Adding window_extensions.mk am: 0df807eab6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20271257

Change-Id: I5f3cc3713478c55e499593ed982a17cee5fb7ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 08:09:34 +00:00
Martin Stjernholm
4a75e406ed Remove dalvik.vm.usejitprofiles system property.
Disabling profiles is no longer supported. Most of the profile support
has been active even when this property was false, and it won't be
supported in the ART Service.

(cherry-picked from commit 7bf4c34e29)

Test: Boot
Bug: 254434433
Merged-In: I1a77f006f204cd2f1fb302bcf4b1126f54e2e78b
Change-Id: I1a77f006f204cd2f1fb302bcf4b1126f54e2e78b
2022-12-06 17:40:29 +00:00
John Reck
bc14f0bedf Merge "IAllocator-V2" am: 2d0f81120c
Original change: https://android-review.googlesource.com/c/platform/build/+/2278630

Change-Id: Ic6d58503ade6ae65370a7e6ffe076320047713ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 00:23:36 +00:00
John Reck
2d0f81120c Merge "IAllocator-V2" 2022-12-01 23:48:40 +00:00
Seth Moore
4f4c9dbf02 Merge "Add rkpd system service mainline module to build" am: 922a22fb9e
Original change: https://android-review.googlesource.com/c/platform/build/+/2263923

Change-Id: I753cf53e4e8e723536d1737d4b35fa447c0d7e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 22:02:45 +00:00
Seth Moore
922a22fb9e Merge "Add rkpd system service mainline module to build" 2022-12-01 21:45:38 +00:00
John Reck
60860ac5c3 IAllocator-V2
Test: make
Change-Id: Ifa1ef1a91e7de94d5ad27c846d287d9bbacabd2a
Merged-In: Ifa1ef1a91e7de94d5ad27c846d287d9bbacabd2a
2022-12-01 17:38:53 +00:00
Marc Kassis
de657cf3f1 graphics.common V3 -> V4
Bug: 251177105
Test: m
Change-Id: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598
Merged-In: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598
2022-12-01 16:25:57 +01:00
Louis Chang
0df807eab6 Adding window_extensions.mk
Adding window_extensions.mk to include all the necessary
packages and properties.

Bug: 235797785
Test: build and verified locally
Change-Id: I79a4152c02d40d6686b98b14c264f3d52c7c4a2c
2022-11-30 15:25:38 +00: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
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
363cf8881f Add rkpd system service mainline module to build
Test: service-rkp-unittest
Change-Id: I74e0bff2965154a0091d6573b4bfb2c93027b0cb
2022-11-21 11:15:10 -08: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1fc32534d7 Merge "Hack aosp_riscv64 config to fix m droid dist" am: 324ad55c0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2281222

Change-Id: I3d9a10c5d1eecd6247bc83820d6243bdd99e4fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 02:56:21 +00:00
Treehugger Robot
2fbfed8bdc Merge "HACK: disable most of the build for riscv64" am: b9b754e19b
Original change: https://android-review.googlesource.com/c/platform/build/+/2281221

Change-Id: I6c13bbc1392a1fdcff070a93bc82ac3a484240b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 23:34:10 +00:00
Colin Cross
aef92033bc Hack aosp_riscv64 config to fix m droid dist
`m droid dist` fails on hiddenapi rules missing bootclasspath classes,
add default_art_config.mk to set PRODUCT_BOOT_JARS, and then override
PRODUCT_USES_DEFAULT_ART_CONFIG back to false to avoid a dependency
from the boot.zip dist artifact to dex2oat, which doesn't work for
riscv64 yet.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Icc332ee9132568251386ec742932f6708312bb92
2022-11-01 16:12:27 -07:00