Android Build Coastguard Worker
fc7bc8c4bf
Merge cherrypicks of ['android-review.googlesource.com/3157038'] into 24Q3-release.
...
Change-Id: Ia625353098e984c232baeaa050953e66182c4937
2024-07-09 03:00:42 +00:00
David Anderson
e3a3d903aa
Make snapuserd recovery_available.
...
Bug: 349287459
Test: adb reboot recovery
adb root
adb shell ls -l /system/bin/snapuserd
(cherry picked from https://android-review.googlesource.com/q/commit:dcc81d427a9cfcb7560b4ba590ace3348b314860 )
Merged-In: I69a3f8d2fd2d7dc157d14a0f743650881eec473d
Change-Id: I69a3f8d2fd2d7dc157d14a0f743650881eec473d
2024-07-09 02:35:21 +00:00
Android Build Coastguard Worker
6ef90fce62
Merge cherrypicks of ['android-review.googlesource.com/3132440'] into 24Q3-release.
...
Change-Id: I19d817dfdeb54aba404ac8c2109d83024f052e90
2024-06-17 21:43:36 +00:00
David Anderson
aaf11ec896
Revert "snapuserd: Don't statically link outside of ramdisk."
...
This reverts commit c9fa93f4e8 .
Reason for revert: b/347670914
Bug: 347670914
(cherry picked from https://android-review.googlesource.com/q/commit:14fbf6d3909dab706568d1c409a941d5fd2a7428 )
Merged-In: I9d63a69ccf1f8de98ab7cc23b9fbf400863cddfb
Change-Id: I9d63a69ccf1f8de98ab7cc23b9fbf400863cddfb
2024-06-17 21:43:13 +00:00
Android Build Coastguard Worker
c8d22b249c
Snap for 11973804 from fa57c11e10 to 24Q3-release
...
Change-Id: Iad5d64933596101a7d98b44d6c945ab6a9980935
2024-06-15 01:25:03 +00:00
Treehugger Robot
fa57c11e10
Merge "make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35" into main am: a1188013f3 am: 50024efd2e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3007926
Change-Id: I02e7eb7bcc0a2ca521da1876d50d3213b4c1f31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 14:52:34 +00:00
Treehugger Robot
50024efd2e
Merge "make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35" into main am: a1188013f3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3007926
Change-Id: Idc94ab90ac5267ef6e3f3fe1f7e11b44edbdbfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 14:45:04 +00:00
Treehugger Robot
a1188013f3
Merge "make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35" into main
2024-06-14 14:37:05 +00:00
David Anderson
8a9bd00859
Merge "snapuserd: Don't statically link outside of ramdisk." into main am: 2119b10f6f am: 35ca9086e1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3129366
Change-Id: I907393cd04049336158bef82b7529c1760d3997f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 00:42:20 +00:00
David Anderson
35ca9086e1
Merge "snapuserd: Don't statically link outside of ramdisk." into main am: 2119b10f6f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3129366
Change-Id: I1b6c192139d2bf3961e3c6a6e8049471b6537e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 00:34:52 +00:00
David Anderson
2119b10f6f
Merge "snapuserd: Don't statically link outside of ramdisk." into main
2024-06-14 00:33:02 +00:00
Android Build Coastguard Worker
f9c9ad8198
Snap for 11967491 from 6d45f1404e to 24Q3-release
...
Change-Id: I67c273d49a434c3574b875fa762fd5dc6e699bbc
2024-06-13 23:25:01 +00:00
David Anderson
c9fa93f4e8
snapuserd: Don't statically link outside of ramdisk.
...
Also, remove snapuserd from the vendor ramdisk since this isn't used
anymore.
Bug: 345158294
Test: ldd snapuserd_ramdisk and system/bin/snapuserd
apply full OTA on aosp_cf
Change-Id: I2c2ad1458d67a8449c548e22660f523ba9c86849
2024-06-13 01:29:12 +00:00
Android Build Coastguard Worker
5a78f5e3dc
Snap for 11959661 from 34c50ae37e to 24Q3-release
...
Change-Id: I4e711754f9b2573f1ad13ca34f00c19c901277d2
2024-06-12 23:25:40 +00:00
Akilesh Kailash
6d45f1404e
Merge "Revert "libsnapshot: set thread priority"" into main am: 35bd4d8f30 am: 283b2037ce
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3128361
Change-Id: Ibae24a7574c0d77194596128ab053c5000c4ad11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:33:58 +00:00
Akilesh Kailash
283b2037ce
Merge "Revert "libsnapshot: set thread priority"" into main am: 35bd4d8f30
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3128361
Change-Id: I4109dc8c87570fdd7bbdb189fa4368ac67c632af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:18:14 +00:00
Akilesh Kailash
35bd4d8f30
Merge "Revert "libsnapshot: set thread priority"" into main
2024-06-12 20:06:10 +00:00
Daniel Zheng
0cc44e2a83
Merge changes Iba59fdc3,I812fccf2 into main am: 8d63f0080a am: f2500732b9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114109
Change-Id: Ia941458c7f0ebdfd5ec69a92e2b293b86f6500b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 19:08:41 +00:00
Daniel Zheng
6b0d51fa18
Merge "libsnapshot: pass build config o_direct" into main am: 54d6c0cf45 am: 53d6dc7609
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3101423
Change-Id: I1acee58335ea580f131c481d60e23919c5f060ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 19:07:48 +00:00
Daniel Zheng
f2500732b9
Merge changes Iba59fdc3,I812fccf2 into main am: 8d63f0080a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114109
Change-Id: Icf8a1278e1957f140f48fb88d4d50c4dca9ccfc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:53:26 +00:00
Daniel Zheng
53d6dc7609
Merge "libsnapshot: pass build config o_direct" into main am: 54d6c0cf45
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3101423
Change-Id: I53ca11d624cd503aff12b376672736639960a2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:53:11 +00:00
Daniel Zheng
0168ec74d0
Revert "libsnapshot: set thread priority"
...
This reverts commit db560090e4 .
Reason for revert: breakage on aosp-main
Change-Id: Ib3384dce1e08dd19bce305eee4249d7167d74e10
2024-06-12 18:32:57 +00:00
Daniel Zheng
8d63f0080a
Merge changes Iba59fdc3,I812fccf2 into main
...
* changes:
libsnapshot: configure threshold size
libsnapshot: set thread priority
2024-06-12 18:22:44 +00:00
Daniel Zheng
db560090e4
libsnapshot: set thread priority
...
Read merge thread + worker thread priority from build configurations. In
the case of low memory devices, a lower priority will reduce CPU
utilization post OTA reboot.
Test: th
Change-Id: I812fccf2ca805d9686a837774e1770a2eebf979a
2024-06-12 11:21:38 -07:00
Daniel Zheng
28801377a5
libsnapshot: configure threshold size
...
Test: th
Change-Id: Iba59fdc3e1188dd343314d129806d2c4c94aa8c5
2024-06-12 11:21:38 -07:00
Daniel Zheng
54d6c0cf45
Merge "libsnapshot: pass build config o_direct" into main
2024-06-12 18:14:27 +00:00
Treehugger Robot
bf85dfabff
Merge "toolbox/modprobe: Load modules from /lib/modules based on page size" into main am: 441f39230e am: e3a1b98495
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3124933
Change-Id: I17b6d4d4259d960a37c5f55b16a7ba6f6cd9d013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 15:32:01 +00:00
Treehugger Robot
e3a1b98495
Merge "toolbox/modprobe: Load modules from /lib/modules based on page size" into main am: 441f39230e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3124933
Change-Id: I6a19514aa824ef775f03576a63b39790bca74451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 15:13:02 +00:00
Treehugger Robot
441f39230e
Merge "toolbox/modprobe: Load modules from /lib/modules based on page size" into main
2024-06-12 14:56:06 +00:00
Juan Yescas
64776335c0
toolbox/modprobe: Load modules from /lib/modules based on page size
...
Load modules from /lib/modules for 4kb page size kernels when
the -d option is not present. Do not do this for 16kb page size kernels
due it will load the 4kb modules when PRODUCT_16K_DEVELOPER_OPTION
is true.
Depending on the value of PRODUCT_16K_DEVELOPER_OPTION, the
kernel modules can be located in several directories:
- true: There are 2 directories that contain the 4kb and 16kb
modules.
- 4kb modules are in /lib/modules
- 16kb modules are in /lib/modules/<uname -r>_16k
- false: There is only one directory that contains only one type
of the kernel modules, either 4kb or 16kb.
- /lib/modules
This is a temporary fix for the 16kb developer option. This
b/346659501 will track the proper fix.
Test: Boot target husky-trunk_staging-userdebug with developer
option.
Test: Boot target husky_pgagnostic-next-userdebug without developer
option.
Bug: 345609905
Bug: 343971855
Change-Id: I9bab33d9f06743bd10ee804b20db8f39467fcc52
2024-06-11 18:41:49 -07:00
Bart Van Assche
34c50ae37e
Merge "Revert "Make foreground and background I/O priority different"" into main am: 0b2f24ceb1 am: 59e4997280
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126515
Change-Id: I1d7c58793b47bcac18352e1d2ececaedbe4c6ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:32:46 +00:00
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
Spandan Das
cb87b7d6d2
Merge "Add libz to static libs of libutils_test" into main am: 8bc0ee30bf am: afe62313db
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2919586
Change-Id: Ie241efaa8b49439d11caaf63cbb04a12ffbab871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:19:07 +00:00
Treehugger Robot
773220e50b
Merge changes I68fa51f8,Ia16aa041,Iba57f5cf into main am: 4c5b2303b9 am: 296446e368
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114672
Change-Id: Icd6644c5eb6890250209cd3066291c8b42b40455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:17:56 +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
010fed6467
Merge "[CrashReporting] Correct guest arch init" into main am: c438dab75e am: 4269705b0c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126753
Change-Id: I67c06d110ae0772499184baa049cb497a00bd8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 20:57:39 +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
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