Commit graph

90294 commits

Author SHA1 Message Date
Konrad Adamczyk
5cc1ca1762 Revert^3 "init: Look for super partition only on a boot device"
This reverts commit 5bfb93678f.

Reason for revert: b/376468452 and trusty boot up on arm64. This CL is causing a lot of troubles (now only on emulator, but may affect more devices in field) and shall be reverted. Desktop team will handle support for selecting single boot source (while having more than one) as part of boot_part_uuid support (at aosp/3318438).  

Change-Id: I2804c119631f592d0862f3472ffe18dbb23b17e5
2024-10-31 08:25:54 +00:00
Konrad Adamczyk
5bfb93678f Revert^2 "init: Look for super partition only on a boot device"
This reverts commit 8d71220df2.

Reason for revert: Fix for gcar emulator (basically all QEMU-based emulators) landed at aosp/3315253 and aosp/3160116.

Change-Id: If4eddd3f7e224c31019ad3bd752e2375c7567780
2024-10-24 07:28:25 +00:00
Jusik Chung
8d71220df2 Revert "init: Look for super partition only on a boot device"
This reverts commit 6f0ebcb526.

Reason for revert: b/371393845 boot up failure of gcar emulator

Change-Id: I15e5bea609938cf5a1e347666b9a2abb287cb086
2024-10-04 02:21:37 +00:00
Jan Dabros
6f0ebcb526 init: Look for super partition only on a boot device
Init code is bailing out as soon as `super` partition was
found in the system, ignoring rest of uevents.

In case given device contains multiple boot sources, `super`
partition as well as all other partitions shall be taken
from the same boot source, instead of relying on
`which uevent came first`.

Bug: 309244873, 349144493
Test: Plug secondary USB boot device to device that supports multiple
      boot sources. Select boot from USB. Device boots properly.

Signed-off-by: Jan Dabros <dabros@google.com>
Signed-off-by: Konrad Adamczyk <konrada@google.com>

Change-Id: I70eb7d4223258ec273faa523cb67ddab0b7c32a0
2024-09-27 06:43:00 +00:00
Vova Sharaienko
778ad88da6 Merge "Added ownership attribution for test targets" into main 2024-09-26 22:18:57 +00:00
Vova Sharaienko
892ef23a9e Merge "Add host support to libexpresslog" into main 2024-09-26 22:18:57 +00:00
Vova Sharaienko
78d5f7c6f5 Added ownership attribution for test targets
Flag: NONE Docs
Bug: n/a
Test: build
Ignore-AOSP-First: will cp to aosp after
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8a32d828847a989523ebee8d21d084cf1d55a605)
Merged-In: I6ca6e48ea1ec704216833c2c04177b0022e7b659
Change-Id: I6ca6e48ea1ec704216833c2c04177b0022e7b659
2024-09-26 21:12:01 +00:00
Vova Sharaienko
717b4a7187 Add host support to libexpresslog
- change to a set of build artifacts

Flag: EXEMPT Refactor

Ignore-AOSP-First: will cp to aosp after
Bug: n/a
Test: build
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1396f9d3bb43ea44aa6b0a67fe44570828f9f668)
Merged-In: I8b565a9237319da0b24fed2c802f0e03a15bcd57
Change-Id: I8b565a9237319da0b24fed2c802f0e03a15bcd57
2024-09-26 21:11:51 +00:00
Treehugger Robot
0de42845ad Merge "Remove OEM_UNLOCK_PROP usage" into main 2024-09-26 15:34:05 +00:00
Treehugger Robot
038b6269b0 Merge "Use std::sync::LazyLock rather than once_cell." into main 2024-09-26 11:10:04 +00:00
Treehugger Robot
eedb53cb0c Merge "trusty: utils: trusty-ut-ctrl: fix the vendor target" into main 2024-09-25 08:34:56 +00:00
Treehugger Robot
2d78a263bd Merge "trusty: support secure storage in system-ext" into main 2024-09-25 07:54:22 +00:00
Armelle Laine
3d90ed0cea trusty: utils: trusty-ut-ctrl: fix the vendor target
Bug: 369492636
Test: trusty-ut-ctl -D <trusty device> <port-name>

Change-Id: I9d8a298941caa4e3c5a424269577580be0ba79c8
2024-09-25 07:00:51 +00:00
Armelle Laine
69f3da832f trusty: support secure storage in system-ext
Bug: 355194622
Test: CF gets booted with KeyMint TA in VM
Change-Id: I3708ac572068162ca57c0e9b287296cea73215a7
2024-09-25 06:46:54 +00:00
Priyanka Advani (xWF)
1350207265 Merge "Revert "Support vendor partition in non-debuggable pVMs"" into main 2024-09-24 21:21:38 +00:00
Pechetty Sravani (xWF)
16f94816db Revert "Support vendor partition in non-debuggable pVMs"
Revert submission 3236797-b/340506965

Reason for revert: DroidMonitor created revert due to b/366178299.

Reverted changes: /q/submissionid:3236797-b/340506965

Tracking bug: b/369390218

Change-Id: I0ec7fe89a7a0ca3a9981cd80222d03a785e9b28f
2024-09-24 18:31:49 +00:00
Treehugger Robot
bb8dbd6b07 Merge "Update struct to include far and elr on the NS side" into main 2024-09-24 10:09:53 +00:00
Alice Wang
179d341569 Merge "trusty: utils: trusty-ut-ctrl: add to system_ext" into main 2024-09-24 06:45:08 +00:00
Treehugger Robot
b9e63943de Merge "Fix the trigger name for loading bpf programs." into main 2024-09-24 01:49:11 +00:00
Treehugger Robot
02ae1e127d Merge "trusty: storage: proxy: FS_READY property setting on vendor only" into main 2024-09-24 00:43:54 +00:00
Armelle Laine
d26f39ab0e trusty: storage: proxy: FS_READY property setting on vendor only
Bug: 367965796
Test: launch_cvd --noresume --console=true \
      --extra_kernel_cmdline='androidboot.selinux=permissive' \
      --secure_hals=guest_keymint_trusty_insecure
Change-Id: I4d5ea1762f7cf9edfd8cbc00e2aec13caae965f4
2024-09-23 23:38:14 +00:00
Armelle Laine
4f0e3eb6f2 trusty: utils: trusty-ut-ctrl: add to system_ext
Bug: 367423387
Test: atest VtsHalSecureStorageTargetTest

Change-Id: I70a8a9108c7399f99bfdf26b00c5fbd1fcb039c6
2024-09-23 23:37:09 +00:00
Maciej Żenczykowski
b4b3950e52 Fix the trigger name for loading bpf programs.
The trigger name should be load-bpf-programs, not load_bpf_programs.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I00cff0a3dd971de39dfc3226b140be972854ea28
2024-09-23 21:34:33 +00:00
Maciej Żenczykowski
3e8f0b53e4 Merge "start netd earlier" into main 2024-09-23 21:16:05 +00:00
Maciej Żenczykowski
e60b760e74 start netd earlier
In this change we're moving the asynchronous netd startup ahead of
the async statd and *synchronous* update_verifier.

This is desirable as we want a netd failure (which could
happen due to some mainline incompatibility wrt. bpf
or mainline shipped shared libs: resolver or netd updatable)
to be considered a signal for a bad boot.

It's still asynchronous though, so it's not ideal.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib3e252f085f569864feddaf20ac80858a3bb969d
2024-09-23 21:15:01 +00:00
Treehugger Robot
23903e1655 Merge "Support vendor partition in non-debuggable pVMs" into main 2024-09-23 20:27:15 +00:00
Treehugger Robot
9d0b877619 Merge "Move the dist target of mke2fs to build/core/tasks" into main 2024-09-23 02:35:53 +00:00
Han Wang
47718268d4 Remove OEM_UNLOCK_PROP usage
* It was only used for adb host scripts, but after commit
   "Remove sys.oem_unlock_allowed check for Android device"
   in 2016, there is no usage for it. Remove it because this prop
   is now exposed to untrusted apps, which is not desirable.

Change-Id: Ic1c2f4e06b3a07ecf3f724fe5085974c626cb3fc
2024-09-22 03:51:29 +00:00
Andrew Walbran
34083b7151 Use std::sync::LazyLock rather than once_cell.
This was recently stabilised in Rust 1.80.

Test: Treehugger
Change-Id: I33a16bb1ad6c868c5d32ab72d08ce4e7f910300f
2024-09-20 15:27:46 +01:00
Inseob Kim
65daca3b88 Merge "Mount /mnt/vm earlier" into main 2024-09-20 08:01:56 +00:00
Treehugger Robot
d53b098097 Merge "Replace base::RandInt with std::uniform_int_distribution" into main 2024-09-20 05:36:34 +00:00
Shengsong Tan
ad5948a810 Replace base::RandInt with std::uniform_int_distribution
As part of the effort to uprev libchrome in Android, we are
removing Android dependencies to libchrome utility functions
that are not strictly required.
This CL remove the usage of base::RandInt and replace by std cpp

Bug: 360917504
Change-Id: I83ea0f00ca07074f8c6c9a69db343a65cc8deb27
Test: atest libfs_avb_internal_test
2024-09-20 04:49:35 +00:00
Treehugger Robot
8da4af89fd Merge "trusty: keymint: rename trusty_ipc_dev property" into main 2024-09-19 19:45:51 +00:00
Christopher Ferris
57b902c32d Merge "Remove define of SA_EXPOSE_TAGBITS." into main 2024-09-19 16:40:04 +00:00
Armelle Laine
2ea6ecf71d trusty: keymint: rename trusty_ipc_dev property
matching the naming convention for a system service property

Bug: 309007107
Test: launch_cvd --noresume --console=true \
      --extra_kernel_cmdline='androidboot.selinux=permissive' \
      --secure_hals=guest_keymint_trusty_insecure
Change-Id: I7c31f36dcac49d60469de44ce75c9b46a333786e
2024-09-19 14:25:45 +00:00
Nelson Li
10120f1db2 Move the dist target of mke2fs to build/core/tasks
Because `mke2fs`, `make_f2fs`, and `make_f2fs_casefold` have
`recovery_available` set to true, Soong forcibly adds a new variation
with a `_recovery` suffix to the existing variations. If this is
directly added to the `dist` of the corresponding module, it will cause
duplication of the `android_recovery_<arch>/meta_lic` and
`android_<arch>/meta_lic` files.

Therefore, it is temporarily moved to `build/core/tasks`. Once the
issues are resolved, they will be moved to the corresponding modules.

Bug: 349741178
Test: m sdk dist
Change-Id: Id003f6aed85c909aeb36606691cc4daf10c9c1d4
2024-09-19 07:19:25 +00:00
Christopher Ferris
cfdfb32d13 Remove define of SA_EXPOSE_TAGBITS.
This is in the uapi headers now.

Test: Builds and treehugger.
Change-Id: I0dcebeec722ae2835a1054ee8b39329cd06799d4
2024-09-19 02:04:16 +00:00
Snehal
f3f3845b44 Update struct to include far and elr on the NS side
Bug: 354119614

Change-Id: I88a5f08ead9a536e12bc4a3e8d701e01aa8b8f29
2024-09-18 14:31:04 +00:00
Shengsong Tan
752112003d Merge "Remove usage of base/string/* in libfs_avb" into main 2024-09-18 11:15:16 +00:00
Jerry Chang
2f84febec1 Merge "Add input event profile to mitigate input latency of input threads" into main 2024-09-18 10:36:32 +00:00
Jerry Chang
72b0186a38 Add input event profile to mitigate input latency of input threads
Bug: 347122505
Test: manual dump Perfetto

Change-Id: I224fa31a7358fcd32dfb1c3fa9dec35101e97163
2024-09-18 08:18:42 +00:00
Shengsong Tan
b5d9d909c5 Remove usage of base/string/* in libfs_avb
As part of the effort to uprev libchrome in Android, we are
removing Android dependencies to libchrome utility functions
that are not strictly required.

This CL remove the usage of base/string/* and replace by
android-base/string*

Bug: 360917504
Change-Id: I89e7bdd66bdf8f565f6b2084a70335616a644069
Test: atest libfs_avb_internal_test
2024-09-18 02:11:43 +00:00
Treehugger Robot
c8e38c0f64 Merge "Add getFdStateDebug to access Looper's callbacks" into main 2024-09-17 20:45:05 +00:00
Paul Ramirez
7d9c9af946 Add getFdStateDebug to access Looper's callbacks
Added getFdStateDebug to access Looper's internal state.

Flag: EXEMPT testing
Test: TEST=libutils_test; m $TEST && $ANDROID_HOST_OUT/nativetest64/$TEST/$TEST --gtest_filter="LooperTest.getFdStateDebug*"
Change-Id: I253ed4a6fa1040053117dcea3be80e55eef9a9b0
2024-09-17 17:40:11 +00:00
Shengsong Tan
e322d54337 Merge "Remove usage of base/logging.h in libfs_avb" into main 2024-09-17 11:14:50 +00:00
Treehugger Robot
007f95d721 Merge "libsnapshot: CHECK -> CHECK_EQ" into main 2024-09-16 21:04:49 +00:00
Steven Moreland
7b577cf43c libsnapshot: CHECK -> CHECK_EQ
This will print the values of the strings which are not equal
so that we can debug.

Bug: 366531882
Test: build, TH
Change-Id: I36a2b8d3fbda145e07cd8ccb01152a3a3adf21b0
2024-09-16 17:24:25 +00:00
Inseob Kim
f5af00e79f Mount /mnt/vm earlier
To support early VM in the init stage.

Bug: 331320802
Test: boot and check /mnt/vm
Change-Id: If6f20a616ad24ae194e6fae292c9be200b63185b
2024-09-13 14:02:10 +09:00
Treehugger Robot
511a1733ec Merge "Define linker.config.json as a filegroup" into main 2024-09-13 03:25:02 +00:00
Christopher Ferris
bd66ab0a2b Merge "Remove unused variable." into main 2024-09-12 23:54:54 +00:00