Commit graph

7733 commits

Author SHA1 Message Date
Treehugger Robot
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
Bob Badour
3a0f0c157e Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: Ia7cddef9748f6c036a2fc7539dad717ebc131f7c
2022-04-07 22:03:29 -07:00
SzuWei Lin
0c791bedb4 Support building EROFS for GSI targets
The EROFS is planned to replace the ext4 as the file system format
of readonly partitions. This patch is enabling the ability to
build GSI with EROFS. The usage is

  $ GSI_FILE_SYSTEM_TYPE=erofs make -j

Bug: 227552340
Test: lunch gsi_arm64-user; GSI_FILE_SYSTEM_TYPE=erofs make -j
Test: Verify the file system format of system.img
Change-Id: Ie815002c677d099c4db0ab7ca22db16ac6123659
2022-04-07 07:11:24 +00:00
Martin Stjernholm
47dcbeaefb Build modules from source for module products.
This overrides the branch default
(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE) if it is set to use
prebuilts.

Test: build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns false with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=module_arm64 \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns true with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=mainline_modules_x86 \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns true with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=redfin \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns false with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Bug: 222723757
Change-Id: I0faea006b0e95eff40bbfbe00cc74ba5985beeba
2022-03-30 18:16:51 +01:00
Kelvin Zhang
8a7277df41 Remove snapuserd from vendor ramdisk
When BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is set,
snapuserd.recovery will be installed to vendor ramdisk, which we don't
want. To remove snapuserd from vendor ramdisk, remove
snapuserd.recovery. And only include it if dedicated recovery partition
is enabled. For non-dedicated recovery case, boot partition contains
snapuserd.

Test: th
Test: acloud create --local-image --local-instance, install OTA, reboot
Change-Id: Ib8173f68a1f43b736fe609977a36ad4851e0c367
2022-03-24 10:43:37 -07:00
Treehugger Robot
00ba4d5ea0 Merge "Remove iorapd from base product packages" 2022-03-22 04:09:42 +00:00
Treehugger Robot
f16854d5f8 Merge "Re-land "Enable CFI for Bluetooth in new home"" 2022-03-21 15:02:11 +00:00
Treehugger Robot
ed21d0f56a Merge "Roll-forward the VNDK snapshot list of GSI to 32" 2022-03-18 09:09:35 +00:00
Yi-yo Chiang
1d7c7f674e Roll-forward the VNDK snapshot list of GSI to 32
Bug: 216414337
Test: Presubmit
Merged-In: Ic6cec82357cec8f4ad7bee62a4eaf2f7685b730f
Change-Id: I76026d6f518c51966bc652eeb617b61967af77a7
2022-03-18 04:50:48 +00:00
Myles Watson
d0a9ac08b9 Re-land "Enable CFI for Bluetooth in new home"
This reverts commit 2b0dd3bcbd.

Reason for revert: Fix landed at CL # 2029417
Bug: 221893030
Test: cert/run
Tag: #gd-refactor

Change-Id: I22799c8f898233851a5f2ae54add8e4f71541c94
2022-03-17 16:44:06 +00:00
Bram Bonné
ce8629fdbf Merge "Cherry pick sdk_sandbox dev keys." 2022-03-17 12:31:30 +00:00
Beth Thibodeau
cdd28862c3 Merge "Revert "Enable CFI for Bluetooth in new home"" 2022-03-17 00:49:07 +00:00
Beth Thibodeau
2b0dd3bcbd Revert "Enable CFI for Bluetooth in new home"
This reverts commit 6c7cce123c.

Reason for revert: DroidMonitor: Potential culprit for b/225059300 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Change-Id: I0f790404ba95ec2ba343c31faa58f4eb7c198758
2022-03-17 00:21:02 +00:00
Treehugger Robot
21b35496ee Merge "Enable CFI for Bluetooth in new home" 2022-03-16 20:34:04 +00:00
Myles Watson
6c7cce123c Enable CFI for Bluetooth in new home
Bug: 221893030
Test: cert/run
Tag: #gd-refactor
Change-Id: I34d8749d200de04b68f7ad9bd5b49b06dddc7841
2022-03-16 10:03:23 -07:00
Patrick Rohr
33b6aaff5e Merge "Remove ethernet-service jar dependency." 2022-03-16 16:03:30 +00:00
Bram Bonne
029dffaf72 Cherry pick sdk_sandbox dev keys.
Test: make, boot

Bug: 224796470
Bug: 203670791
Bug: 220320098

Merged-In: Ib0cdf7786c7f74cf294c54187649114e8ec6d315
Merged-In: I3f757c7e3e81c2ac31cd623eae68f7778bf3bafa
Change-Id: I70d6a745b8b2fc9ba68791caae2e83f8eb74c645
2022-03-16 15:39:41 +01:00
Treehugger Robot
9fee6befad Merge "Remove GKI from gsi_$arch" 2022-03-16 07:07:46 +00:00
Xiao Ma
cb1e69c3bf Remove ethernet-service jar dependency.
ethernet service source code is going to be moved into Connectivity
mainline module, and start the ethernet service from the module. The
old ethernet-service lib will be deprecated, remove it from soong
build rule.

Bug: 210586283
Test: m
Change-Id: Iae154ca3462e76b7e0af7172d424f36dece63531
Merged-In: I19d517cac28c18c70b8dad979ecbfe3fb6d26902
2022-03-16 00:54:09 +00:00
Colin Cross
7ee2eaaf79 Use single module for clang runtime libraries
The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.

Bug: 220019988
Test: m checkbuild
Change-Id: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
Merged-In: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
2022-03-15 13:14:53 -07:00
Eric Jeong
5c55d72c6b Remove iorapd from base product packages
- iorapd is being removed.
- So, it cannot be installed.

Bug: 211461392
Test: build okay
Change-Id: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
Merged-In: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
(cherry picked from commit 4c0ac42c06)
2022-03-14 10:29:07 -07:00
Kelvin Zhang
ecdfb79033 Split VABC into two .mk files
1. android_t_baseline.mk enables baseline features, such as io_uring,
   userspace merge, etc. But sets compression method to none. T
   launching devices should include this. It also moves snapuserd from
   vendor_ramdisk to init_boot
2. To add compression, set PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD to
   gz/brotli

Test: th
Bug: 219841787

Change-Id: I6ae4d951b0a64f142acd4c152ce96375d47ecf74
2022-03-14 09:31:47 -07:00
Kelvin Zhang
e30ed7c8da Add snapuserd/e2fsprogs/f2fs-tools to init_boot partition
Anything remotely related to first stage init should be added to
init_boot

Test: th
Bug: 219841787

Change-Id: I60ada5ff426b04f3e4f842ad7a714615fcc7cb77
2022-03-09 15:12:43 -08:00
Paul Hu
8b81343e39 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 70dc07dbd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1976806

Change-Id: I1be61a70760e41474cd227a202a9ed19d29b384f
2022-03-02 07:27:23 +00:00
Paul Hu
70dc07dbd3 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" 2022-03-02 07:11:25 +00:00
Akilesh Kailash
5b33dc20ae Merge "Enable Async merge during OTA" am: 6eb483745b
Original change: https://android-review.googlesource.com/c/platform/build/+/2001772

Change-Id: I18acbfd77ad2b5a615679eff74651fa54a9bfcef
2022-03-02 01:29:15 +00:00
paulhu
83f6ef5379 Rename framework-connectivity-tiramisu to framework-connectivity-t
Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
Change-Id: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
2022-03-01 01:26:31 +00:00
Akilesh Kailash
6c171a69b2 Enable Async merge during OTA
If the async merge has a temporary failure, gracefully fallback
to synchronous I/O without failing the OTA merge.

Bug: 220991038
Test: 1: OTA on CF pre-submit runs
2: OTA on O6, R4 and Bramble with the following flow on TP builds:

BUILD-1 (without-this-patch) -> BUILD-2 (with this patch) -> BUILD-3 (with this patch)

Verified the failure path of async merge on all three devices

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I0b499d2cc81f44c74f85745f9165b81d0ce34eba
2022-02-28 06:29:50 +00:00
Anton Hansson
06c347653c Merge "Add an ndk product and device" am: e9d3c2e85a
Original change: https://android-review.googlesource.com/c/platform/build/+/1990890

Change-Id: I9b19c3561696755dea1e9ffcff8a6d814cffc30f
2022-02-23 18:55:33 +00:00
Anton Hansson
e9d3c2e85a Merge "Add an ndk product and device" 2022-02-23 18:31:44 +00:00
Anton Hansson
3327b9fc79 Add an ndk product and device
This adds a product that generates a soong.variables config similar to
the one manually maintained for the ndk build at the moment.

Bug: 174315599
Test: TARGET_PRODUCT=ndk m nothing && inspect out/soong/soong.variables
Change-Id: Ia10079b8a1ed8edf4efa2a6a5b04a079eece5360
2022-02-23 13:25:59 +00:00
Peter Collingbourne
2012fd1d00 Merge "Reland "Add a core configuration that disables the zygote."" am: 8e5920a665
Original change: https://android-review.googlesource.com/c/platform/build/+/1987266

Change-Id: I9702c77f909848ff302febf0540958ae35c680c6
2022-02-18 21:12:47 +00:00
Peter Collingbourne
8e5920a665 Merge "Reland "Add a core configuration that disables the zygote."" 2022-02-17 18:37:21 +00:00
Treehugger Robot
283db80c18 Merge "Revert "Enable io_uring feature for virtual A/B OTA"" am: 28e4826995
Original change: https://android-review.googlesource.com/c/platform/build/+/1987208

Change-Id: Iff21d565b191489221534fe4f094d113e3cd2abe
2022-02-16 12:57:45 +00:00
Akilesh Kailash
f1e7fb3af7 Revert "Enable io_uring feature for virtual A/B OTA"
This reverts commit f72860ce18.

Reason for revert: http://b/219642530 - I/O failures seen on one specific device intermittently. Let's pause this; I will revisit it before we land it back as we don't want to hold dogfood builds.

Change-Id: I3a80ccf5f67daed01d5b2e6a502e8acea85a769f
2022-02-16 04:21:01 +00:00
Peter Collingbourne
69c29e1bc3 Reland "Add a core configuration that disables the zygote."
In targets that do not include a zygote binary, attempting to start the
zygote service will result in repeated service restarts. Avoid this by
providing a way for targets to opt out of declaring a zygote service.

The fvp_mini target does not have a zygote, so apply this opt-out to
that target.

Relanding after fixing breakage on an internal branch.

Bug: 217455793
Change-Id: Ic26f76142afb5f700bd7b12359d62feb2652b617
2022-02-15 16:03:35 -08:00
Xin Li
b3a96bd273 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ibcb32225098883b4098807da6468a539e1c41c0c
Change-Id: I408a03e95c0240420c5e5492988abdc4937a0a62
2022-02-11 07:01:21 +00:00
Alexander Potapenko
0015b6953a add dmesgd to base system
Bug: 215095687
Test: run on a user device with injected KFENCE bugs
Change-Id: I7776d96400d46fa31bcd8f04728877402dce1162
2022-02-10 15:46:01 +01:00
Akilesh Kailash
58588768aa Merge "Enable io_uring feature for virtual A/B OTA" 2022-02-10 07:35:42 +00:00
Akilesh Kailash
f72860ce18 Enable io_uring feature for virtual A/B OTA
snapuserd: Use io_uring READ/WRITE opcodes for snapshot merge.
Specifically, it is used only for readahead and ordered ops
code path.

    Snapshot merge perf:

    ===========================================================

    Incremental OTA of 300M between two git_master branches on Pixel 6:

    ===========================================================

    On Android S (with dm-snapshot): ~15 minutes:

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 926508ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

    On Android T (with io_uring: ~38 seconds):

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 38868ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

Bug: 202784286
Test: Full/Incremental OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ia6efff32898cdc6b683ca49c233ef45e8cd732e7
2022-02-08 20:00:39 +00:00
DarkJoker360
db4e956dc1 Fix typos in telephony_vendor product makefile
- Remove blank PRODUCT_COPY_FILES

Change-Id: I4c8a19565dc09a802e630d3b057522b3a3ee1cbd
2022-02-07 19:14:23 +01:00
Jordan Demeulenaere
d183371cda Merge "Revert "Add a core configuration that disables the zygote."" 2022-02-07 14:53:40 +00:00
Jordan Demeulenaere
fe3d2e672a Revert "Add a core configuration that disables the zygote."
Revert submission 1964759-master-I4f918502e611e950fa039e4e2ed817c97b928ba2

Reason for revert: b/217993447
Reverted Changes:
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....

Change-Id: I5d51a021fea89a0ab6c73349d93117d60cfc9350
2022-02-07 09:05:29 +00:00
Treehugger Robot
fb9ec40e65 Merge "Add a core configuration that disables the zygote." 2022-02-04 23:52:33 +00:00
Peter Collingbourne
c19c517894 Add a core configuration that disables the zygote.
In targets that do not include a zygote binary, attempting to start the
zygote service will result in repeated service restarts. Avoid this by
providing a way for targets to opt out of declaring a zygote service.

The fvp_mini target does not have a zygote, so apply this opt-out to
that target.

Change-Id: I4f918502e611e950fa039e4e2ed817c97b928ba2
2022-01-27 20:18:39 -08:00
Bob Badour
d2c7c08e7c Fix licenses and license texts.
Use Android-Apache-2.0 for all Apache 2.0

Remove legacy_restricted (no longer appears in code).

Remove Android.bp which did not build anything but was a placeholder
for the missing license texts.

Test: m nothing
Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-24 16:19:41 -08:00
SzuWei Lin
eec848fd6a Remove GKI from gsi_$arch
After having gki_$arch, there is no longer need for building GKI
by target gsi_$arch. The BoardConfigGkiCommon.mk is also moved
to /device/generic/common. The patch removes all GKI related
settings and files from target gsi_$arch.

Bug: 212486689
Test: build dist of gsi_arm64-userdebug
Test: build dist of aosp_arm64-userdebug
Change-Id: I369f42ad1f6e3f519bb62c3f035e699df1c7468f
2022-01-21 11:54:12 +08:00
George Chang
5baca438e6 Add nfc HAL ndk to gsi
Bug: 204868826
Test: m
Change-Id: I5f590bcc401170b565fb6684ac343d84fb0bdc5e
2022-01-20 03:49:15 +00:00
Paul Hu
89d7061ed3 Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" 2022-01-20 03:02:56 +00:00
Treehugger Robot
e2647e13a8 Merge "Remove clatd" am: 3cf8f4b061 am: 0e00550664 am: 551a9edf7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1948621

Change-Id: I524955a5af59705186855a34d23bdfc86847d027
2022-01-15 01:00:56 +00:00