Commit graph

7710 commits

Author SHA1 Message Date
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
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
Nucca Chen
aa5fc6ecbd Remove clatd
clatd have been moved to apex module.

Test: TH

Change-Id: Ibcb32225098883b4098807da6468a539e1c41c0c
2022-01-14 14:02:05 +00:00
Treehugger Robot
806c252953 Merge "Updates OWNERS file" am: 35efbedb4f am: dd52cdce2e am: 14e6ca5053
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I34fbfa9fe76da1688a6b680d80de8a2a3fae5bf5
2022-01-12 04:32:54 +00:00
Treehugger Robot
35efbedb4f Merge "Updates OWNERS file" 2022-01-12 03:37:34 +00:00
Treehugger Robot
ce1c150981 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d am: 316b3b71e0 am: 50c9214e69
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: Ie2adfb4f6417a568cc2e31d404418e69d620f19e
2022-01-11 14:59:30 +00:00
Treehugger Robot
7297032a8d Merge "Make com.android.sepolicy mandatory" 2022-01-11 14:11:37 +00:00
Bowgo Tsai
221628f342 Updates OWNERS file
gsi_keys.mk has been removed on commit
I3714de75b94be43a1364b89b92d893b336aa014b. Removing it from
the OWNERS file and adds developer_gsi_keys.mk.

Bug: 176869478
Test: presubmit
Change-Id: I2eeee65a244c4987f217f004ec47a0b6dca9b564
2022-01-11 11:13:25 +08:00
Jeff Vander Stoep
fe91d896ee Make com.android.sepolicy mandatory
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
Merged-In: I23599517b427363e758e6f06763079cc1482cb47
2022-01-10 10:28:39 +00:00
Treehugger Robot
5f1458f6d9 Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da am: a029ebb6dc am: 1f7cbd5dd6
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: I4f72846d4d54f53e9f4396c6ef5aca9b638d387f
2022-01-07 16:18:04 +00:00
Treehugger Robot
e2a927ed97 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 am: 03990e11c4 am: d695dfdc70
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: Ifb11629a6fd8e2711692f92d1a61e465c3108780
2022-01-07 16:16:30 +00:00
Treehugger Robot
097f6bc1da Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" 2022-01-07 13:07:25 +00:00
Treehugger Robot
1c2c284063 Merge "Add a.hardware.audio.common and a.media.audio.common" 2022-01-07 13:07:10 +00:00
Josh Wu
6abae30df6 Add android.hardware.bluetooth.audio-V1-ndk.so
This is the package for the shared types of AIDL Audio HAL.

Bug: 203490261
Test: m
Change-Id: I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73
Merged-In: I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73
2022-01-05 23:44:27 -08:00
Josh Wu
408c7e40a5 Add a.hardware.audio.common and a.media.audio.common
This is the package for the shared types of AIDL Audio HAL.

Bug: 198812639
Test: m
Change-Id: Ia953963380794591eae6b1140d180dc36dfbe7ca
Merged-In: Ia953963380794591eae6b1140d180dc36dfbe7ca
2022-01-06 07:25:13 +00:00
Jacky Liu
5f1bdb32ae Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 am: 429e1f339b
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I79f822306e48c9de2dc76d5f6edd6f27041369d1
2022-01-06 07:17:43 +00:00
Jacky Liu
bff997fd1f Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" 2022-01-06 06:31:37 +00:00
Steven Moreland
d95de7fdc2 Merge "Don't require current.txt order." am: 9ca3c34646 am: 8e9e313bf4 am: 45259cd69d
Original change: https://android-review.googlesource.com/c/platform/build/+/1932881

Change-Id: I8c3de047bdd3dd38735939b92d11e2e0b9f0525e
2022-01-05 22:56:11 +00:00
Steven Moreland
9ca3c34646 Merge "Don't require current.txt order." 2022-01-05 22:09:27 +00:00
Treehugger Robot
dca625aed6 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 am: af48f4be53 am: 259deaacd8
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I76a0b8e56bf8e269d170f9159bdb306e199c084f
2022-01-05 17:51:55 +00:00
Jacky Liu
beb0b6927c Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip
Equivalent to PRODUCT_EXTRA_RECOVERY_KEYS but for A/B OTA.

Bug: 211848136
Test: set PRODUCT_EXTRA_OTA_KEYS and check otacerts.zip
Change-Id: I81e27d12a22b405f6227b09c01ed684dfcede19e
2022-01-05 17:54:40 +08:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
2022-01-05 02:59:45 +00:00
Treehugger Robot
a5726efd0a Merge "Re-landing "removing gsi_keys.mk"" am: 8c861cec97 am: 87d6967714 am: 6c73a8ae5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1931644

Change-Id: Ib52aaa3d34f06e5b744148cffc8f402d93d34449
2021-12-27 03:48:05 +00:00
Bowgo Tsai
b30a23cca2 Re-landing "removing gsi_keys.mk"
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I3714de75b94be43a1364b89b92d893b336aa014b
2021-12-24 12:28:32 +08:00
Steven Moreland
15b89d8fcd Don't require current.txt order.
There have been a lot of merge conflicts because of this file (and a
few cases of people needing to merge changes internally because of
it). Though, we really don't care about the order of the file. So,
compare ignoring order. If there is a merge conflict in the future,
we can change the order slightly, and we can gradually clean up the
order over time, as needed (really, it's not important).

Bug: N/A
Test: file reordered as build-time check
Change-Id: I955a2bd78872ff6d975bc494f10b2ed5e532c680
2021-12-23 22:18:42 +00:00