Commit graph

89859 commits

Author SHA1 Message Date
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
Daniel Zheng
9a3a1a14b4 libsnapshot: pass build config o_direct
If o_direct is enabled in build configuration, forward this argument to
snapuserd when the daemon is started.

Bug: 332255580
Test: th
Change-Id: I8e4be5503665031735dba2ebc748e209c45df942
2024-06-11 13:20:23 -07: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
Android Build Coastguard Worker
a9b6240ac1 Snap for 11949167 from 864a14af31 to 24Q3-release
Change-Id: I9f4bedc866e8a12e3db8b162e20b2605ec8fb1d5
2024-06-10 23:25:35 +00:00
Kiyoung Kim
864a14af31 Merge "Make public.libraries.android.txt available to filesystem" into main am: fb30388ac1 am: 9cb1921b42
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107757

Change-Id: I221c4a7c21c797f197ff9fb77d50ebdc2c5c2b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 04:40:34 +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
Android Build Coastguard Worker
141ef846b8 Snap for 11944020 from 274952982b to 24Q3-release
Change-Id: I621a950baa89499503d1146dbd3e82a5605cb84c
2024-06-08 01:26:34 +00:00
Treehugger Robot
274952982b Merge "Add reserved to CrashDetail proto" into main am: c623193110 am: 4942b5db85
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3108167

Change-Id: Icd5a3c4a7c59cc35dca436f79175427ca1287d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 21:21:23 +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
Android Build Coastguard Worker
2509f7931f Snap for 11938003 from 9963d9fd0e to 24Q3-release
Change-Id: I2ff5418cc07a6310ed5690bfc14d47c712f96c3f
2024-06-06 23:24:36 +00:00
Greg Kaiser
ebc71cd929 Merge "Update zygote32 rc file to match others" into main am: 94ba56b68d am: e302d99348
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3118538

Change-Id: Ib6c5823a0638d26f071b213c2784b6547f71c805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:45:38 +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
9963d9fd0e Merge changes from topic "modprobe-pgsize-fix" into main am: 0cb931b1ce am: e8d6ed0547
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3110063

Change-Id: I1d2e30a5d6fd96f26fda48a8a0502a499ea0d3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 15:40:50 +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
93bc0eb115 Merge "Add proposed trendy teams for CTS modules" into main am: 30d0608988 am: b99af91eba
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3115379

Change-Id: I85c78e22b100c3df647ba47f8ec1cf8c907871d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 02:26:00 +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
Android Build Coastguard Worker
154560726b Snap for 11931036 from d61da594a2 to 24Q3-release
Change-Id: Icc154d606c69f6e6294759a0909b4f70c6ed7f26
2024-06-05 23:29:42 +00:00
Steven Moreland
73b6bc2dcf Merge "PREUPLOAD += bpfmt" into main am: 48028b6d9c am: d719469d7f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114280

Change-Id: Ib18f6bd813322ac8bfa614b9f9cbe674df1630d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 22:09:06 +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
c281c1453a Merge "init: enable 'user root' check at build time" into main am: e767a71114 am: 1fe09c7337
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092789

Change-Id: Ibd2059c641e536be437e3e438835614d05018f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 20:00: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
d61da594a2 Merge "libc++fs is part of libc++ now." into main am: 5b09799b9f am: fb066360d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3113960

Change-Id: Ie867fd03358a9a98d3d7504ac596ed9e904b1fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 16:38:45 +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
0e22179849 Merge "Revert "Move native coverage output directory."" into main am: 1c5b2fd454 am: d3e28326c7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3112281

Change-Id: I6fd4c1d29db348da770f6039c906cfb6f120f5db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 00:08:56 +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
Android Build Coastguard Worker
2985e823d9 Snap for 11914274 from 19ce293596 to 24Q3-release
Change-Id: I927a0051b939b1ed59fcdf6d464fbd69c1a2b949
2024-06-01 01:24:46 +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
19ce293596 Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main am: cdd4cb7db8 am: 203b44e3ab
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107399

Change-Id: I13565eb63e5cd35144758817a487a4beb00eeb43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:45:46 +00:00