Commit graph

90199 commits

Author SHA1 Message Date
Jordan Abrahams-Whitehead
7af66f47bc Merge "Add cpu-target-features binary" into main am: d5f8aa8fbf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3233503

Change-Id: I2dccb81cc8ced791cb204fcc75703107c8b2bee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-03 17:13:22 +00:00
Jordan Abrahams-Whitehead
d5f8aa8fbf Merge "Add cpu-target-features binary" into main 2024-09-03 17:10:25 +00:00
Dan Shi
6767e393f0 Merge "Revert "Skip F2FS formatting for dev option enabled devices"" into main am: 5e359c04ac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251222

Change-Id: Ie9e72fa2b184a5cb6e6f0b87a679fdd90a563cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-31 03:18:55 +00:00
Dan Shi
5e359c04ac Merge "Revert "Skip F2FS formatting for dev option enabled devices"" into main 2024-08-31 03:10:10 +00:00
Dan Shi
642a98e2a7 Revert "Skip F2FS formatting for dev option enabled devices"
This reverts commit c2f2263bbf.

Reason for revert: possble cause of b/363089777

Change-Id: Ie7979e49bcbab6c99c0c7cba71e0b3858bfe0fbf
2024-08-30 23:14:15 +00:00
Akilesh Kailash
76a1e0ecdf Merge "libsnapshot: static link libselinux" into main am: 0049369534
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251031

Change-Id: I9d49c7a7eb22345c2c7ba8188bc41327b2c9dc8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 21:45:16 +00:00
Akilesh Kailash
0049369534 Merge "libsnapshot: static link libselinux" into main 2024-08-30 21:39:49 +00:00
Treehugger Robot
989a67e175 Merge "ueventd: fix other assorted style nits" into main am: 41db2810bc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251531

Change-Id: I554596ba134204315503426645ddbe7e789e17fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 21:35:10 +00:00
Treehugger Robot
41db2810bc Merge "ueventd: fix other assorted style nits" into main 2024-08-30 21:31:21 +00:00
Treehugger Robot
df40adb5e8 Merge "ueventd: fix confusing indentation" into main am: cc9de747df
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3249129

Change-Id: Ia0f276cc4c623c1564c1c69bc302249d4f70cb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 20:11:20 +00:00
Treehugger Robot
cc9de747df Merge "ueventd: fix confusing indentation" into main 2024-08-30 20:00:01 +00:00
Akilesh Kailash
a78a77bff4 Merge "libsnapshot: compile tests for both 32 and 64 bit" into main am: 172f412b25
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236906

Change-Id: Ie92e6cc1ad5f0a05b5760f9ffbf4c0c5c6c14e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 17:58:57 +00:00
Akilesh Kailash
172f412b25 Merge "libsnapshot: compile tests for both 32 and 64 bit" into main 2024-08-30 17:47:23 +00:00
Eric Caruso
bb4a40955a ueventd: fix other assorted style nits
Indentation in this file is four spaces, remove an
unnecessary trailing semicolon, put a space between
a type declaration and its structured binding.

clang-format shuffled a line around as well.

Bug: None
Test: compile
Change-Id: Ib4cf17fecb1e54971020dc77b7903d2aac5dd9c1
2024-08-30 13:39:49 -04:00
Akilesh Kailash
109eae5cd7 libsnapshot: compile tests for both 32 and 64 bit
Bug: 360254891
Test: vts_libsnapshot_test
Change-Id: I7c49bf5e40c58022e1930e054ebc0bd9319b4da2
2024-08-30 09:10:40 -07:00
Eric Caruso
23276f63af ueventd: fix confusing indentation
Bug: None
Test: compile
Change-Id: I8eb39792ed13ba61dd6a61e9771935ece33ae915
2024-08-30 11:31:35 -04:00
Akilesh Kailash
093fd351fa libsnapshot: static link libselinux
libsnapshot_init is linked by microdroid. Adding libselinux as whole_static_libs in `libsnapshot_defaults` will bloat the super image of microdroid.

Instead, statically link libselinux for libsnapshot_init.

On Pixel 7 Pro:

Microdroid super image: 47173836
Baseline (Without this change): 47161548

Bug: 362839899
Test: Build, verify microdroid super image size.
Change-Id: I3c589097173b305c1d39af9edbfb8c5e29f21410
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-08-30 05:29:50 +00:00
Inseob Kim
30c39c8605 Merge "Move adb_keys to product partition" into main am: d7c4b9daea
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3244707

Change-Id: I7ad95aac88caf15eb2f31787428bdc42470fd8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 01:12:46 +00:00
Inseob Kim
d7c4b9daea Merge "Move adb_keys to product partition" into main 2024-08-30 01:08:19 +00:00
Kelvin Zhang
aeeadf43ad Merge "Make some fstab functions available outside of fs_mgr" into main am: 6e1b4c5a1e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3200691

Change-Id: I37940d837a59a413930fbd5a7924dd84518b76f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 17:24:56 +00:00
Kelvin Zhang
6e1b4c5a1e Merge "Make some fstab functions available outside of fs_mgr" into main 2024-08-29 17:15:05 +00:00
Treehugger Robot
62509ec179 Merge "[km] Add a new rust binary for non-secure KeyMint host" into main am: 206bdf2f23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3202950

Change-Id: I08484ee971c0cfbff2fd97264536c8d497ee2cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 16:28:08 +00:00
Treehugger Robot
206bdf2f23 Merge "[km] Add a new rust binary for non-secure KeyMint host" into main 2024-08-29 16:21:34 +00:00
Treehugger Robot
2f70233fd8 Merge "Skip F2FS formatting for dev option enabled devices" into main am: b346ff1e23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3192001

Change-Id: Ife820d68ec082b8140184ec805c53ca07f61cfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 14:58:09 +00:00
Treehugger Robot
b346ff1e23 Merge "Skip F2FS formatting for dev option enabled devices" into main 2024-08-29 14:54:42 +00:00
Alice Wang
b9b2830c81 [km] Add a new rust binary for non-secure KeyMint host
The new binary sets non-secure RoT for keymint. The non-secure
version will be used on cuttlefish.

Bug: 355194622
Test: CF is gets booted with KeyMint TA in VM
Change-Id: Iff202c6d4bb70dabeb866b4f3fbc18c006bb219e
2024-08-29 11:25:27 +00:00
Jacky Jian
4dcb108e2f Merge "isBlockAligned to use uint64_t" into main am: be85b80f23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3248296

Change-Id: Ie1769a02d5fb520f51d18ba20581ef06668c2747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 06:41:02 +00:00
Jacky Jian
be85b80f23 Merge "isBlockAligned to use uint64_t" into main 2024-08-29 06:37:41 +00:00
Treehugger Robot
ed3d9b4047 Merge "Standardize page property." into main am: 8067bd819f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236773

Change-Id: I999ac8cabc159ecda5518c47548c167a0faf7d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 01:36:59 +00:00
Treehugger Robot
8067bd819f Merge "Standardize page property." into main 2024-08-29 01:31:05 +00:00
Daniel Zheng
15e9846473 isBlockAligned to use uint64_t
We want to avoid the usage of size_t for any integer value that could
exceed 2^32 (for 32 bit platforms). Let's update the usage here for
future compatibilty and avoid silent truncation failures.

Bug: 361048795
Test: th
Change-Id: I9ce2ca21706270a218f06f7d2b7dc9fade185a68
2024-08-28 19:27:09 +00:00
Treehugger Robot
fb0a0cc63e Merge "libsnapshot: Move snapshot metadata to super partition." into main am: 40f2bfd604
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3183126

Change-Id: Ib527bdd0b45aa86fa3d4efb1a5debc6be7c54ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 17:44:36 +00:00
Treehugger Robot
40f2bfd604 Merge "libsnapshot: Move snapshot metadata to super partition." into main 2024-08-28 17:39:29 +00:00
Kelvin Zhang
c2f2263bbf Skip F2FS formatting for dev option enabled devices
F2FS does not support page_size!=block_size configuration, and
dev option devices need to toggle between 4K/16K mode, hence F2FS
requires a data wipe every time page size changes. This is inconveinent,
skip F2FS formatting instead.

Test: th
Bug: 353436188
Change-Id: Ic33dbc39c16db3aee4c47349a9693aacec240de8
2024-08-28 10:28:48 -07:00
Kelvin Zhang
f61be9ea39 Make some fstab functions available outside of fs_mgr
Test: th
Bug: 353436188
Change-Id: I5d1d80935d345245dece579ea2d2cbdb61ebaf11
2024-08-28 10:28:48 -07:00
Jooyung Han
e23142bf92 Merge "libinit_host: clean up dependencies" into main am: ad6ec1e35d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3241426

Change-Id: I498b891c6f5d5f5a00535b1668cad57bc357c5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 07:23:30 +00:00
Jooyung Han
ad6ec1e35d Merge "libinit_host: clean up dependencies" into main 2024-08-28 07:14:45 +00:00
Akilesh Kailash
398203d1da libsnapshot: Move snapshot metadata to super partition.
snapshot metadata files are stored in /metadata. This means, we cannot
wipe after installing any update.

This patch does the following:

1: Create a scratch space in super partition. The scratch space for ota
   metadata is just about 1MB.

2: Create ext4 filesystem on top of scratch block device.

3: Mount the scratch on /mnt/scratch_super

4: When snapshot-manager instance is created, point the /mnt/scratch/ota
to metadata_dir_ so that all the snapshot files are stored in the new
path.

All the logic of OTA remains the same. This flow is enabled only on userdebug builds for now and the only consumer would be snapshotctl

$snapshotctl apply-update /data/nbd/ -w

During init, we would have to mount the scratch partition to detect
if there is any pending updates.

With this, we would now be able to wipe the device along with the update flow. This will help incremental flashing wherein we would end up saving ~35-40 seconds on Pixel devices.

With this flow, the end-to-end update for incremental builds takes
~20-30 seconds.

Bug: 330744468
Test: Pixel 6 incremental flashing with wipe, Full OTA, vts_libsnapshot
Change-Id: Iac6ce2cf37b70ea221cd18175c8962988d03d95b
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-08-27 23:48:03 -07:00
Inseob Kim
715dd707c4 Move adb_keys to product partition
/adb_keys will be moved to /product/etc/security as it's a
product-specific file. To prevent regression, /adb_keys will be a
symlink to the new location.

Bug: 353430323
Test: boot and connect adb with ADB_VENDOR_KEYS
Change-Id: I3dd200a1583be8f99bd5c30ecfed1bdc544ca783
2024-08-28 15:47:33 +09:00
Terry Guan
6c2ae18845 Merge "Add resume from hibernation in first stage init" into main am: adcba86848
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3225543

Change-Id: Ie0d25b69ac9b94e7927cb323ee0f0b93571048f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 21:31:26 +00:00
Terry Guan
adcba86848 Merge "Add resume from hibernation in first stage init" into main 2024-08-27 21:22:51 +00:00
terryguan
d96c6b8e88 Add resume from hibernation in first stage init
If bootconfig hibernation_resume_device is present in boot config, then
we write that value to /sys/power/resume

Bug: 339688542
Test: Check resume from hibernation/boots with/without config present
Change-Id: I1a9bf63af4dab07e494740722898c1aba33c00b5
2024-08-27 09:37:25 -07:00
Christopher Ferris
70f98e406a Merge "Move variable only used on aarch64." into main am: e0ec54b436
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3242487

Change-Id: Id687bebae10127a6fab02d65dad4b59244783996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 16:25:09 +00:00
Christopher Ferris
e0ec54b436 Merge "Move variable only used on aarch64." into main 2024-08-27 16:20:46 +00:00
Jooyung Han
9b4ad17bfb libinit_host: clean up dependencies
libinit_host doesn't need HIDL stuff. host_init_verifier does HIDL
interface checks.

Bug: 326827772
Test: mmma system/core
Change-Id: I59c1444649a62202abb54a2e0cceee38522c1259
2024-08-27 13:10:33 +09:00
Christopher Ferris
1e7b7cbc58 Move variable only used on aarch64.
The kTagGranuleSize is only used in aarch64, so you can get
unused variable warnings for other targets. Move this definition
closer to where it's used and in aarch64 code.

Test: Build with unused checking on.
Change-Id: I9baf660430508ee3ca1efb62585ee1b038c6b0f3
2024-08-26 15:30:32 -07:00
Elliott Hughes
e7e708bf05 Merge "host_signal_fixup.h: remove unused file." into main am: c9d70be7fe
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3241480

Change-Id: I226ee2972e0467eb9abfbc62440e17028f5eee11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 18:28:47 +00:00
Elliott Hughes
c9d70be7fe Merge "host_signal_fixup.h: remove unused file." into main 2024-08-26 18:24:25 +00:00
Elliott Hughes
4e96338890 host_signal_fixup.h: remove unused file.
We don't need this any more because the glibc headers have been updated, but it looks like it wasn't being used anyway.

Change-Id: Ie98ae473af504c49a8cae07fa06ec7f1568f662d
2024-08-26 12:43:04 +00:00
Jooyung Han
56fd9e2830 Merge changes from topic "refactor-init-servicelist" into main am: efbc08e0ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3234865

Change-Id: I4e051e8f530e06af50b4a043d7446ea75e15bc03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 07:57:06 +00:00