Commit graph

89123 commits

Author SHA1 Message Date
Akilesh Kailash
fa5cf6884a snapshotctl: Check for cow path when allocated from /data
If the COW device is allocated only from /data, then
the COW device name will end with -cow-img. Hence, check
that path as well.

Bug: 335552315
Test: snapshotctl apply-update
Change-Id: Id3c5cf8afd77994da117de41bb98a226b350f8e4
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-04-18 06:19:56 -07:00
Treehugger Robot
8a92f2d747 Merge "Updated fuzz_config in Android.bp file" into main 2024-04-18 01:55:15 +00:00
Inseob Kim
f1ddc62db3 Build etc/hosts with Soong
Bug: 335369205
Test: build
Change-Id: I3a33e80dc751ddce874fe1345594e6dc5f27b36c
2024-04-18 10:44:46 +09:00
Treehugger Robot
68c7869e86 Merge "Don't install Android-only dependencies to microdroid" into main 2024-04-17 22:37:56 +00:00
David Drysdale
a8934ddc26 Merge "Warn that reboot might be needed after setting IDs" into main 2024-04-17 17:12:08 +00:00
David Drysdale
8005cfa7e4 Warn that reboot might be needed after setting IDs
Test: compile
Change-Id: Iac93f6a60df7e1a9f89183deabb37e0efc16df91
2024-04-17 16:27:49 +01:00
Jiyong Park
12c64a7586 Don't install Android-only dependencies to microdroid
init_second_stage_defaults provides properties that are common to both
Android's init and Microdroid's init. Before this CL, it included
target.product.required and target.recovery.required properties. The
required dependencies were Android-specific; the dependencies included
Android-only init.rc. Microdroid has its own init.rc (microdroid_init_rc
module).

This was problematic but so far it didn't cause an issue because those
Android-only dependencies were not installed to Microdroid due to a bug
in the build system.

As we fix the build system bug, the Android-only dependencies started
get installed to Microdroid, effectively overriding the Microdroid-only
init.rc file. This made Microdroid fail to boot.

Fixing this issue by moving the Android-only dependencies out of the
defaults module and putting them on the Android's init.

In addition to that, this CL removes the recovery variant for the
Microdroid's init because it's not used.

Bug: N/A
Test: run AVF tests
Change-Id: I09748f1123125cac74ce54fd5c360c9a3ba2f996
2024-04-17 14:36:55 +09:00
T.J. Mercier
6d6ff398b3 Merge changes from topic "memcg_v2_soong_flags" into main
* changes:
  Add build flag to split the cgroup v2 hierarchy into apps/system
  Add build flag to force memcg to the v2 cgroup hierarchy
  Use ConvertUid{Pid}ToPath for all path generation
  Fix unused params and remove unneeded cflags
2024-04-16 21:40:38 +00:00
Donnie Pollitz
636234bebf storageproxyd: Add arguments for storage mapping and max file
Background:
* -f = Allows mapping files in the format `-f file:backing_file`.  This
  can be used for mapping secure storage files like `0` and `persist/0`
  to block devices.  Storageproxyd will handle creating the appropriate
  symlinks in the root datapath
* -m = Allows specifying the the max size constraint for file backed storages.
  The constraint is chosen by giving a file, this allows for passing a
  block device for which a max file size can be queried.  File based
  storages will be constrained to that size as well.

Bug: 324989972
Test: File sizes are restricted as specified, and mappings are created
Change-Id: I8ff550afafbd372288daa9e27c4db3451948b25d
Signed-off-by: Donnie Pollitz <donpollitz@google.com>
2024-04-15 16:26:34 +00:00
Treehugger Robot
73c6f08f5e Merge "Wait for disconnect when rebooting to userspace FB" into main 2024-04-13 04:35:47 +00:00
Shrinidhi Hegde
4922633d3f Merge "Throttle reboot from native watchdog" into main 2024-04-12 14:30:23 +00:00
Treehugger Robot
56fde7cc2e Merge "Do not disable LLNDK symbols in header files" into main 2024-04-12 06:21:08 +00:00
Justin Yun
dcce9e044a Do not disable LLNDK symbols in header files
Compiler still requires the LLNDK symbols even if they are removed
when compiling. Still the unavailable symbols break the build in
linking if called with wrong api level.

Bug: 333973388
Bug: 320347314
Test: TH
Change-Id: I79cb921cf6f2789e97f11b88cddf7ca1325998a5
2024-04-12 13:12:57 +09:00
Shrinidhi Hegde
ab9b683840 Throttle reboot from native watchdog
Found out that increasing the threshold to 20 crashes pushes the file
system based rollbacks as well. So introducing a throttling behaviour
instead. Now native watchdog performs reboot with ramdump at 5 restarts.
After that packageWatchdog/ RescueParty takes over to perform other
mitigations. Ram dump + reboot will not be performed more than once
in 24hrs.

Test: manual
Bug: 291137901
Change-Id: Ia192411dad94e8e25c26f700d2fe7f94d41439b8
2024-04-11 15:28:07 +00:00
Akshata Kadam
541f850372 Updated fuzz_config in Android.bp file
Added new fields in fuzz_config like - componentid,
description, vector, service_privilege, users, fuzzed_code_usage, etc.

Bug: 306435930
Test: Build libutils_fuzz_callstack

Change-Id: I826d75ab01eb0a4d2b363681d4f5a3a4578bbc99
2024-04-11 14:31:25 +05:30
Treehugger Robot
ef1a559b1f Merge "vts_fs_test: Annotate fs type test for VSR." into main 2024-04-11 05:04:11 +00:00
Treehugger Robot
57fb5b705b Merge "Updated 'cc' field of fuzz_config in Android.bp file" into main 2024-04-11 04:55:31 +00:00
Treehugger Robot
c22ef3bd63 Merge "Temporarily disable mte_illegal_setjump" into main 2024-04-10 21:55:10 +00:00
Ted Bauer
e6eda1f80e Merge "Create new file for test_mission_1 marker file" into main 2024-04-10 21:16:43 +00:00
Florian Mayer
9216490321 Temporarily disable mte_illegal_setjump
Change-Id: I39a770196a79488160b50d7de4c3baa39dd1c57e
2024-04-10 20:24:56 +00:00
Daniel Zheng
361120ca71 Merge "support negative zstd compression levels" into main 2024-04-10 17:56:45 +00:00
Daniel Zheng
3785e7b1f7 support negative zstd compression levels
Zstd compression goes all the way down to -7. zstd compression level -3
gives around the same compression ratio as lz4 level=3. Need further
testing to see performance comparison

Test: ota_from_target_files, update_device.py
Change-Id: Ic082b31aa8af938f80be628c73667e02353835f0
2024-04-10 10:56:18 -07:00
Ted Bauer
7443b82ce7 Create new file for test_mission_1 marker file
Test: m
Bug: 328444881
Change-Id: I4329fa161922f3dda2e3d7c9a5231f56ac716fac
2024-04-10 15:26:28 +00:00
Mitch Phillips
b8a10dca87 Merge "[GWP-ASan] [debuggerd] Change test to handle default recoverable" into main 2024-04-10 09:30:58 +00:00
Akshata Kadam
fb6957c645 Updated 'cc' field of fuzz_config in Android.bp file
corrected cc field in fuzz_config

Bug: 306435930
Test: Build fastboot_fuzzer

Change-Id: I487838914e515619a4acb68331b9c9c7b2030173
2024-04-10 11:39:05 +05:30
Mitch Phillips
a2f5335b84 [GWP-ASan] [debuggerd] Change test to handle default recoverable
Test: atest debuggerd_test
Bug: N/A
Change-Id: I01d79b0058c5c2b5ff0697be69b252728d46a82e
2024-04-09 15:59:12 +02:00
Treehugger Robot
793679f47a Merge "skip nop persistent property writes" into main 2024-04-09 06:41:58 +00:00
T.J. Mercier
1cfa2c4111 Add build flag to split the cgroup v2 hierarchy into apps/system
This flag adds "apps" and "system" cgroups underneath the v2 hierarchy
root. Cgroups with UIDs < 10000 (AID_APP_START) will be placed
under "system" and others will be placed under "apps". UIDs under 10000
are reserved for core Android subsystems. This allows us to
apply different cgroup controls collectively to system processes and
normal applications.

Bug: 327480673
Change-Id: I40837dee27a59691f81fef48e66a86c5eacda892
2024-04-08 21:15:48 +00:00
T.J. Mercier
f8901767e6 Add build flag to force memcg to the v2 cgroup hierarchy
This flag prevents memcg from being mounted as a v1 hierarchy, even if
cgroups.json specifies it should be mounted as v1. It will activate
memcg in the v2 hierarchy even if cgroups.json does not specify that it
should be activated in the v2 hierarchy.

The cgroup_disable=memory kernel command line argument will still
prevent memcg from being activated, as this forced memcg controller
is marked as optional.

Bug: 327480673
Change-Id: Iad2491dd0c1576156ee2346928d041d85af890f0
2024-04-08 21:15:48 +00:00
T.J. Mercier
d1e048f956 Use ConvertUid{Pid}ToPath for all path generation
Consolidate into a single implementation.

Test: m
Change-Id: I0fc52db2d4b2973a74bad24c0a5f77384a559cee
2024-04-08 21:15:48 +00:00
T.J. Mercier
44eb705480 Fix unused params and remove unneeded cflags
We already get -Wall and -Werror from the build system, and we do not
want/need -Wexit-time-destructors since it prevents local statics with
non-trivial destructors.

Test: m
Change-Id: I8283bf223404d6c253861d3888c1b720c099386e
2024-04-08 21:15:48 +00:00
Daniel Zheng
f5e9af16b6 Merge "libsnapshot: fix warnings" into main 2024-04-08 19:32:48 +00:00
Nikita Ioffe
c079a6c34f Merge "Restorecon /microdroid_resources in setup_selinux" into main 2024-04-08 11:20:39 +00:00
Raphaël Hérouart
20c3933ed4 Merge "lib/trusty: tipc-test should not print results to error stream" into main 2024-04-08 11:07:23 +00:00
Raphael Herouart
b238b90a79 lib/trusty: tipc-test should not print results to error stream
tipc-test results cannot be parsed in the CI because they output to
error stream

Bug: 314130383
Test: /data/nativetest64/vendor/tipc-test/tipc-test -t echo -r 1 -B 100
Change-Id: I2d6506fd69af06338041035526ca759884719c7b
2024-04-08 09:13:46 +00:00
Jiyong Park
78a7365ffc Merge "init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim" into main 2024-04-07 05:23:52 +00:00
Raphaël Hérouart
ef2e67eec1 Merge "lib/trusty: tipc-test suite name is incorrect in JSON output" into main 2024-04-05 14:56:22 +00:00
Raphael Herouart
4f3a4cbc5e lib/trusty: tipc-test suite name is incorrect in JSON output
tipc-test suite should be tipc not crypto

Bug: 314130383
Test: /data/nativetest64/vendor/tipc-test/tipc-test -t echo -r 1 -B 100
Change-Id: Icc0921a032f8b784f4797f43b6180136777f422f
2024-04-05 11:50:42 +00:00
Luca Stefani
3e4159a22e firmware_handler: Print full FW path before loading
As of now ueventd only prints the firmware name
requested by the uevent, but in case the device
has multiple firmware going by the same name it's
more interesting to know what file ends up actually
being used for the firmware request.

Test: m, check logcat
Change-Id: Ia90d387f09789d8e8b337a1a178144fad553d37b
2024-04-05 11:39:31 +02:00
Shrinidhi Hegde
09071c46d8 Merge "Revert "Update native watchdog to be triggered after 20 restarts instead of 4."" into main 2024-04-05 00:23:45 +00:00
Shrinidhi Hegde
ae5ce6f7c3 Revert "Update native watchdog to be triggered after 20 restarts instead of 4."
This reverts commit 1d928ca80b.

Reason for revert: Breaks Host side CTS test https://android-build.corp.google.com/test_investigate/?referrer=buganizer&regressionId=manual-dcf4b8bc69179f9a6bc4ce097a552d84-1712255116&testResultId=TR13229242143019813&invocationId=I86200010262612788

Change-Id: I2627a0c5f5b8d9a19b6a43f678facc64ffa6c189
2024-04-04 19:19:04 +00:00
Treehugger Robot
f0a1a724c0 Merge "Fix typo in comment." into main 2024-04-04 18:29:34 +00:00
Treehugger Robot
d334b826c9 Merge changes I456aa53d,I286c6947 into main
* changes:
  getevent: print error message when failing to get event
  getevent: add Framework Input team as owners
2024-04-04 17:14:32 +00:00
Shrinidhi Hegde
9261e262cb Merge "Update native watchdog to be triggered after 20 restarts instead of 4." into main 2024-04-04 16:25:43 +00:00
Michael Bestas
867f0ada9a
init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim
/data/misc already sets encryption=Require and this causes certain
devices not being able to boot with the following error:

init: Failed to set encryption policy of /data/misc/bootanim to
    a5a40d896b46d8c6 v1 modes 127/4 flags 0x0: The directory already
    has a different encryption policy.
init: Setting a5a40d896b46d8c6 policy on /data/misc/bootanim failed!
init: Setting policy failed, deleting: /data/misc/bootanim
init: Failed to set encryption policy of /data/misc/bootanim to
    a5a40d896b46d8c6 v1 modes 127/4 flags 0x0: The directory already
    has a different encryption policy.
init: Setting a5a40d896b46d8c6 policy on /data/misc/bootanim failed!
init: Rebooting into recovery
init: Got shutdown_command 'reboot,recovery' Calling
    HandlePowerctlMessage()

Test: m; fastboot flashall, observe device boots successfully
Change-Id: I86a2b2b8fe8e438ca405a0e901739d11550d3ebd
2024-04-04 19:11:21 +03:00
Harry Cutts
08686936b5 getevent: print error message when failing to get event
For some reason we weren't saying what the error was here, which could
be useful. Also change the failure message slightly to distinguish
between failing to get inotify and evdev events.

Bug: 245989146
Test: m toolbox
Change-Id: I456aa53d008043ea2549024002f9b88ea8d2d2cf
2024-04-04 15:14:26 +00:00
Harry Cutts
b8f9475fd7 getevent: add Framework Input team as owners
Bug: 245989146
Test: Treehugger
Change-Id: I286c6947e59013afe816b949b51f081bbfe5924e
2024-04-04 15:14:26 +00:00
Jiyong Park
2f8efe00af skip nop persistent property writes
Bug: 332611029
Test: TH
Change-Id: I0f6ca09c781964d1eb432a770c50e7216f043b4f
2024-04-04 22:15:18 +09:00
Nikita Ioffe
feb7e0ea97 Restorecon /microdroid_resources in setup_selinux
The main reason for running restorecon of /microdroid_resources during
the setup_selinux stage is to avoid granting init some weird permissions
like `allow init tmpfs:file relabelfrom;`.

Instead we add such permissions to kernel domain in which setup_selinux
runs. This feels better since kernel domain already has similar
permissions like `allow kernel rootfs:file relabelfrom;`.

Bug: 287593065
Test: run microdroid vm with vendor partition
Change-Id: I82ef5499392e90f53655f7582e887d0b6cb3a5f0
2024-04-04 13:04:52 +00:00
Elliott Hughes
bf33268695 Merge "linker.config.json: remove libpac.so." into main 2024-04-04 00:34:29 +00:00