Bart Van Assche
59e4997280
Merge "Revert "Make foreground and background I/O priority different"" into main am: 0b2f24ceb1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126515
Change-Id: I1dd7a5eb5c8d3d31267f82b98eefda8ab32eac48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:27:54 +00:00
Bart Van Assche
0b2f24ceb1
Merge "Revert "Make foreground and background I/O priority different"" into main
2024-06-11 23:14:34 +00:00
Spandan Das
afe62313db
Merge "Add libz to static libs of libutils_test" into main am: 8bc0ee30bf
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2919586
Change-Id: I6fc236f5d4a94b9ff08890fc39ba2dee4e63b6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:13:12 +00:00
Spandan Das
8bc0ee30bf
Merge "Add libz to static libs of libutils_test" into main
2024-06-11 23:08:56 +00:00
Treehugger Robot
296446e368
Merge changes I68fa51f8,Ia16aa041,Iba57f5cf into main am: 4c5b2303b9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114672
Change-Id: Ibcf0ea9e83d2f8e7936f52dc6d9f6002a36b8bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:02:54 +00:00
Treehugger Robot
4c5b2303b9
Merge changes I68fa51f8,Ia16aa041,Iba57f5cf into main
...
* changes:
libprocessgroup: Remove unused includes; add missing ones
libprocessgroup: Don't delegate to default constructor
libprocessgroup: Use default member initializers
2024-06-11 22:45:24 +00:00
Sijie Chen
4269705b0c
Merge "[CrashReporting] Correct guest arch init" into main am: c438dab75e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126753
Change-Id: Ic64e9b98306f855ed23b42242f069abd4ce145b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 20:42:55 +00:00
Sijie Chen
c438dab75e
Merge "[CrashReporting] Correct guest arch init" into main
2024-06-11 20:27:36 +00:00
Bart Van Assche
4cb11951e2
Revert "Make foreground and background I/O priority different"
...
It has been reported that CL "Make foreground and background I/O
priority different" causes Android devices equipped with eMMC storage
to reboot if there is sufficient I/O activity. Hence revert commit
7f3fe0aaf2
.
Bug: 186902601
Bug: 342034992
Change-Id: I4fa9c782eb0e801b410cb358e20fe41acebe1094
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-06-11 20:17:44 +00:00
T.J. Mercier
54bfde03e1
libprocessgroup: Remove unused includes; add missing ones
...
No functional changes.
Bug: 346584259
Test: m
Change-Id: I68fa51f86b6baaa34fb2cdfdc16a4d1ff61e1e5f
2024-06-11 18:24:34 +00:00
T.J. Mercier
10826481ba
libprocessgroup: Don't delegate to default constructor
...
Manually calling a defaulted default constructor from a another
constructor is superfluous, and can increase code size if the default
constructor is not otherwise used. There's nothing to delegate, so
remove the call.
Bug: 346584259
Test: m
Change-Id: Ia16aa041fdee7434587cf90645d7f95cba4e0d10
2024-06-11 18:24:23 +00:00
T.J. Mercier
df67107ac4
libprocessgroup: Use default member initializers
...
... instead of direct initialization in the default constructor
implementation. This allows us to just explicitly default the
constructor and provide no implementation.
Initialize class variables in the header and remove no-op constructor
to simplify code.
Bug: 346584259
Test: m
Change-Id: Iba57f5cfbf8e4d5d18ce178d39f8bcd2d76c8aaa
2024-06-11 18:23:58 +00:00
Sijie Chen
06603fe143
[CrashReporting] Correct guest arch init
...
Init guest arch to NONE, otherwise Arm32 will be used.
Bug: 288392666
Test: NA
Change-Id: Ib92b0351401b700a18d03e21a68569c2811d163c
2024-06-11 17:51:48 +00:00
Kiyoung Kim
9cb1921b42
Merge "Make public.libraries.android.txt available to filesystem" into main am: fb30388ac1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107757
Change-Id: Ie9657c616d5e5008035aa50dff5b432a4b065d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 04:18:38 +00:00
Kiyoung Kim
fb30388ac1
Merge "Make public.libraries.android.txt available to filesystem" into main
2024-06-10 04:02:16 +00:00
Treehugger Robot
4942b5db85
Merge "Add reserved to CrashDetail proto" into main am: c623193110
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3108167
Change-Id: Ia5acccce99f3a4a64de7cfaea89d5987f3c67860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 21:06:57 +00:00
Treehugger Robot
c623193110
Merge "Add reserved to CrashDetail proto" into main
2024-06-07 20:53:06 +00:00
Greg Kaiser
e302d99348
Merge "Update zygote32 rc file to match others" into main am: 94ba56b68d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3118538
Change-Id: Ic5188e35ea216833c83cd959ef359fd9834120dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:16:03 +00:00
Greg Kaiser
94ba56b68d
Merge "Update zygote32 rc file to match others" into main
2024-06-06 20:57:51 +00:00
Greg Kaiser
f2064c3a0d
Update zygote32 rc file to match others
...
In I3aad4b4b1d2f54db9e7ba86db8a655d8552bad0a we set MaxPerformance
for zygote64_32, and in I7fcceeb22b722c2164b9acf0b517a32ce34731fd
we synced up zygote64 to match this.
However, this change never made it into the zygote32 rc file,
which we fix here.
Bug: 324014808
Test: Basic testing on 32-bit device
Change-Id: I6f0c4490330d05551952fd5d844e02a6b638ca68
2024-06-06 19:11:27 +00:00
Will Deacon
e8d6ed0547
Merge changes from topic "modprobe-pgsize-fix" into main am: 0cb931b1ce
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3110063
Change-Id: Ib63b913ebfc40413cb7fbe9b54e3b7cef2c0df7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 15:24:54 +00:00
Will Deacon
0cb931b1ce
Merge changes from topic "modprobe-pgsize-fix" into main
...
* changes:
toolbox/modprobe: Filter module directories based on kernel page size
Revert "Load modules from _16K dir when running on 16K kernel"
2024-06-06 15:09:26 +00:00
Will Deacon
c991c3dbed
toolbox/modprobe: Filter module directories based on kernel page size
...
When modules for multiple kernels with the same major/minor versions
are installed on a device, modprobe will search the module directories
based on whatever order scandir() returned them. In this case, it is
possible that we will try to load modules with the wrong page size for
the running kernel, which can lead to obscure symbol CRC mismatches and
ultimately a system crash.
Adjust the scandir() filtering function so that the kernel page size is
taken into account in addition to the major/minor versions returned by
utsname(). The general rule is that module directories ending in "_Nk"
contain modules for a page-size of N KiB, whilst the absence of such
a suffix implies the default of 4 KiB.
Bug: 343971855
Test: Verified that _16k module directory is excluded by modprobe when running in userspace fastboot with 4k pages.
Change-Id: I78a0a249028bbb0bcdd78eb14de36e631e233be0
2024-06-06 11:22:07 +00:00
Yihan Dong
b99af91eba
Merge "Add proposed trendy teams for CTS modules" into main am: 30d0608988
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3115379
Change-Id: I50adaffbff3b605200132777a9c9f623415384dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 02:06:54 +00:00
Yihan Dong
30d0608988
Merge "Add proposed trendy teams for CTS modules" into main
2024-06-06 01:54:57 +00:00
Steven Moreland
d719469d7f
Merge "PREUPLOAD += bpfmt" into main am: 48028b6d9c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114280
Change-Id: I342e03b1e9819e9dfa1b9c2827fd440f5b2fa0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 21:56:37 +00:00
Steven Moreland
48028b6d9c
Merge "PREUPLOAD += bpfmt" into main
2024-06-05 21:35:38 +00:00
Steven Moreland
1fe09c7337
Merge "init: enable 'user root' check at build time" into main am: e767a71114
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092789
Change-Id: I8a8f0f59d26a877945f0d8e792e4cfd6535225ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 19:36:09 +00:00
Steven Moreland
e767a71114
Merge "init: enable 'user root' check at build time" into main
2024-06-05 19:23:20 +00:00
Elliott Hughes
fb066360d8
Merge "libc++fs is part of libc++ now." into main am: 5b09799b9f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3113960
Change-Id: I7b5197225d6ec3beb468e3c36d3c814426bc96bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 16:16:52 +00:00
Elliott Hughes
5b09799b9f
Merge "libc++fs is part of libc++ now." into main
2024-06-05 15:52:20 +00:00
Yihan Dong
f0d3447af5
Add proposed trendy teams for CTS modules
...
Change-Id: I6f4dbaa75c219dd75fec84ab8c9590c4c81ec737
Test: build locally
Bug: 341598672
2024-06-05 01:09:09 +00:00
Steven Moreland
81a1b3ec23
init: enable 'user root' check at build time
...
For visibility.
We could make this only for new API levels, but it isn't
currently exposed at build time, and visibility is good
on upgrades.
Bug: 340953047
Test: build, on device passing and failing requirements
Change-Id: I3a0ea47560c65114bc1b8685954d1fb7687cb8df
2024-06-05 00:58:49 +00:00
Allen Hair
d3e28326c7
Merge "Revert "Move native coverage output directory."" into main am: 1c5b2fd454
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3112281
Change-Id: I4bc12eeb8ca05e91ff5ab3f97cc52665b68398aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:54:41 +00:00
Allen Hair
1c5b2fd454
Merge "Revert "Move native coverage output directory."" into main
2024-06-04 23:37:03 +00:00
Steven Moreland
571d4faecb
PREUPLOAD += bpfmt
...
Bugs: me
Test: upload with bp file
Change-Id: Ie8da54e7f4ceda4c50d9537bf9e8a232653d920d
2024-06-04 23:10:21 +00:00
Elliott Hughes
c088de1879
libc++fs is part of libc++ now.
...
Change-Id: I2be806de736377e77bb49e4b3b9f72e25f7d717a
2024-06-04 16:47:32 +00:00
Allen Hair
f28b9a8b88
Revert "Move native coverage output directory."
...
This reverts commit 65430f8de6
.
Reason for revert: Checking to see if this is the root cause for b/342673274.
Change-Id: I9bb319e73443e57b4ac0b61f5209048d5eb7e6c0
2024-06-03 19:14:52 +00:00
Florian Mayer
f2474379e7
Add reserved to CrashDetail proto
...
Change-Id: I176abc740744907d8559b94b9d1361b44dcbcb14
2024-05-31 22:35:25 +00:00
Will Deacon
4e1776cedf
Revert "Load modules from _16K dir when running on 16K kernel"
...
This reverts commit ffdb017e7d
.
Overriding an explicitly-specified module path (e.g. passed via the
'-d <path>' argument) because the kernel is using 16KiB pages is
inconsistent and unexpected. Revert this change in anticipation of
filtering incompatible modules instead.
Bug: 343971855
Test: Verified that _16k module directory is excluded by modprobe when running in userspace fastboot with 4k pages.
Change-Id: If9c6e2d26fc53b12f543d531d64ef3d288ddc179
2024-05-31 19:13:30 +00:00
Nate Myren
203b44e3ab
Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main am: cdd4cb7db8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107399
Change-Id: I1e5f25f678f79fb61a35cc3980ec0151367f5ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:38:56 +00:00
Nate Myren
cdd4cb7db8
Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main
2024-05-31 01:31:38 +00:00
Treehugger Robot
a25e7949d8
Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main am: 276eabe757
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3109578
Change-Id: I62cd5ad2dcf2be9ff207776486abaa3e01bf8722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 21:27:28 +00:00
Treehugger Robot
276eabe757
Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main
2024-05-30 21:25:26 +00:00
Kelvin Zhang
915f32d892
Revert^2 "Set ro.fstype.data when /data is mounted"
...
062eb59a83
Change-Id: I20c4d4c17e4a314eb8754ed9c03db3dd8e3a5d0f
2024-05-30 19:11:11 +00:00
Kiyoung Kim
ed92eabfbb
Make public.libraries.android.txt available to filesystem
...
public.libraries.android.txt was not installable as it was used only
from microdroid. However, this module can also be used from system
image, as there is no difference from the content. This change marks the
module as no_full_install, so it can be installed in the system image
defined in Android.bp
Bug: 343357947
Test: AOSP CF build succeeded
Change-Id: I15fd47b173b5b718972a6ee18b3aecb58826909c
2024-05-30 16:06:43 +09:00
Peter Collingbourne
3a3b79b02e
Merge "Add fs_config entry for *.rc files." into main am: 68cf5b2239
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107404
Change-Id: Iab2aee8f19db72b09ee03a57b8e2e3128063b635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 01:02:32 +00:00
Peter Collingbourne
68cf5b2239
Merge "Add fs_config entry for *.rc files." into main
2024-05-30 00:54:48 +00:00
Priyanka Advani
9d2cb32a10
Merge "Revert "Set ro.fstype.data when /data is mounted"" into main am: 58a38f4681
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107408
Change-Id: I56adc205d715ce78206bb16a5cad11d4c721470f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 00:01:30 +00:00
Priyanka Advani
58a38f4681
Merge "Revert "Set ro.fstype.data when /data is mounted"" into main
2024-05-29 23:58:59 +00:00