Commit graph

89549 commits

Author SHA1 Message Date
Treehugger Robot
68c7869e86 Merge "Don't install Android-only dependencies to microdroid" into main 2024-04-17 22:37:56 +00:00
David Drysdale
dd71a1aa75 Merge "Warn that reboot might be needed after setting IDs" into main am: a8934ddc26
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046693

Change-Id: I6a38724715144f93b1d218d15d7c937865b58528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 17:37:31 +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
bf598a3bbe Merge changes from topic "memcg_v2_soong_flags" into main am: 6d6ff398b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3003302

Change-Id: Ia5288812b84f4c42ee07caea6492c0d67369249a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 21:59:48 +00: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
6918c0ab6f Merge "Wait for disconnect when rebooting to userspace FB" into main am: 73c6f08f5e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3009736

Change-Id: I35b1cc4d24244efe4f38abb4036a698c142f128f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 04:56:24 +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
07cd69391e Merge "Throttle reboot from native watchdog" into main am: 4922633d3f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3033998

Change-Id: Id18c532efa6ae9bc066463dd4e7e4f5af64c95d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 14:41:39 +00:00
Shrinidhi Hegde
4922633d3f Merge "Throttle reboot from native watchdog" into main 2024-04-12 14:30:23 +00:00
Treehugger Robot
f652333133 Merge "Do not disable LLNDK symbols in header files" into main am: 56fde7cc2e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3038857

Change-Id: Id59f27ec9f32377a69bd2e33b56f3570152e5521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 06:35:57 +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
6930446457 Merge "vts_fs_test: Annotate fs type test for VSR." into main am: ef1a559b1f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3019313

Change-Id: I70d9e8b1df0bb7edc0c8932c64247c53fd39ddc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 05:06:45 +00:00
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
6bed2e8553 Merge "Updated 'cc' field of fuzz_config in Android.bp file" into main am: 57fb5b705b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3036275

Change-Id: I9254908645ee5b857f00d2d137a1fd40a7159f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 04:58:59 +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
33aefc17ef Merge "Temporarily disable mte_illegal_setjump" into main am: c22ef3bd63
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3037875

Change-Id: If2eb4682466f1aead24c63b8e0c79b2691c25755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 21:58:54 +00:00
Treehugger Robot
c22ef3bd63 Merge "Temporarily disable mte_illegal_setjump" into main 2024-04-10 21:55:10 +00:00
Ted Bauer
1e7aefb183 Merge "Create new file for test_mission_1 marker file" into main am: e6eda1f80e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3028944

Change-Id: I380b6c1040ec2d89eea50a484ffc851f4b009cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 21:24:12 +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
3617c83fe0 Merge "support negative zstd compression levels" into main am: 361120ca71
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710359

Change-Id: Ia1fc435da058b6eff7a0c78ebdd349b3c7b2b299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 18:11:25 +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
ff8512e6a7 Merge "[GWP-ASan] [debuggerd] Change test to handle default recoverable" into main am: b8a10dca87
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3033692

Change-Id: I46fa8b915ab250bd98c81f375527b58798523a7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 09:47:56 +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
bb06e6375a Merge "skip nop persistent property writes" into main am: 793679f47a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027483

Change-Id: Iae6327a820574cfceae15a734afd6cc352ba3b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 06:59:48 +00: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
a9754619aa Merge "libsnapshot: fix warnings" into main am: f5e9af16b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2972094

Change-Id: Id0c7d4cc63d662739fbde2e693dd4682842dfa2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 19:58:47 +00:00
Daniel Zheng
f5e9af16b6 Merge "libsnapshot: fix warnings" into main 2024-04-08 19:32:48 +00:00
Nikita Ioffe
a06bc95c6c Merge "Restorecon /microdroid_resources in setup_selinux" into main am: c079a6c34f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3016859

Change-Id: I373a9841af06e6bce5ba1d5fbc62c16833e66a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 11:24:31 +00:00
Raphaël Hérouart
6e30d3a962 Merge "lib/trusty: tipc-test should not print results to error stream" into main am: 20c3933ed4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027819

Change-Id: I1ff496c175648035121503fde7df2098e49657ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 11:24:09 +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
cc055899f9 Merge "init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim" into main am: 78a7365ffc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027805

Change-Id: I4d064f97285a380e174b51cc81000f74d422c337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-07 05:43:50 +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
633f4dba63 Merge "lib/trusty: tipc-test suite name is incorrect in JSON output" into main am: ef2e67eec1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027813

Change-Id: I1f094cae54ff7b59bc07fb862cbb081be2561a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 15:09:05 +00:00