Treehugger Robot
5800999b0b
Merge "Fix one liner" into main am: b5f51166e7
am: a310c0743d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2721418
Change-Id: Ic911891b682afc2fa80ed60ee6d5cdb9972ca92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 19:18:19 +00:00
Treehugger Robot
a310c0743d
Merge "Fix one liner" into main am: b5f51166e7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2721418
Change-Id: Id2058ba14e0e049e99e8b2f90599fd155177ee8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 18:36:23 +00:00
Treehugger Robot
b5f51166e7
Merge "Fix one liner" into main
2023-08-23 18:09:32 +00:00
Daniel Zheng
b497e6f317
Fix one liner
...
Ensuring that the expression is evaluated before being outputed. In
response to comment from aosp/2708333
Test: th
Change-Id: I073c143f1c4e32af11e235ce782947b250117dc5
2023-08-22 14:45:15 -07:00
Treehugger Robot
b97b7d7f67
Merge "Run boringssl tests according to ro.zygote" into main am: a2bac909ce
am: 052542d0fd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702893
Change-Id: I878d8ebcb8b52cc970a1692819879aa1952d5517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 13:51:02 +00:00
Treehugger Robot
052542d0fd
Merge "Run boringssl tests according to ro.zygote" into main am: a2bac909ce
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702893
Change-Id: I2ce4e4ebb22ec65dc4b5108131f9df21cf4a3200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 13:12:05 +00:00
Treehugger Robot
a2bac909ce
Merge "Run boringssl tests according to ro.zygote" into main
2023-08-22 12:55:07 +00:00
Treehugger Robot
3698ced0a9
Merge "init: reset errno in do_start" into main am: 0508911496
am: 6011f614b4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2720693
Change-Id: I79717978c235ca8ab2ade68fb8743b88c18a839a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 09:35:37 +00:00
Treehugger Robot
6011f614b4
Merge "init: reset errno in do_start" into main am: 0508911496
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2720693
Change-Id: I85ae93eb5c013d766c4bcd5fee93376981f28882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 08:57:42 +00:00
Treehugger Robot
0508911496
Merge "init: reset errno in do_start" into main
2023-08-22 08:39:14 +00:00
Jooyung Han
d6b65fb307
init: reset errno in do_start
...
do_start() ignores ENOENT intentionally to avoid logspam. It's
implemented in ErrorIgnoreEnoent. However, without resetting errno,
ErrorIgnoreEnoent will ignore unrelated errors from Service::Start() due
to the sticking errono set from other commands.
Bug: 296821716
Test: launch_cvd
Change-Id: I71d3113bdb69bdca82e2ff4f3a793301749f6c08
2023-08-22 09:59:26 +09:00
Jooyung Han
31f88e858a
Merge "init: clean up DelayService()" into main am: fdbf5a5eac
am: 30e996b9a4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2719034
Change-Id: Ia88b3fcb64cc8adb7e2127a5245b7fd4bba3ae96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:00:22 +00:00
Jooyung Han
30e996b9a4
Merge "init: clean up DelayService()" into main am: fdbf5a5eac
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2719034
Change-Id: I7ed829dfbf762d4bb0b1a446e70633cb8954fa96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:23:41 +00:00
Jooyung Han
fdbf5a5eac
Merge "init: clean up DelayService()" into main
2023-08-21 22:52:01 +00:00
Treehugger Robot
0b835794c3
Merge "Load kernel modules from /lib/modules/uname -r
_$(page_size) if present" into main am: d4e75d578b
am: 41d7f15c4d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2717339
Change-Id: I24ccbea53c8e7f56a5ab2c74d21026ee872ede2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:44:51 +00:00
Treehugger Robot
41d7f15c4d
Merge "Load kernel modules from /lib/modules/uname -r
_$(page_size) if present" into main am: d4e75d578b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2717339
Change-Id: I9295551c587be853bb24741b6b8c8eaf79b29d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:06:48 +00:00
Treehugger Robot
1937311500
Merge "libfs_avb: Allow overriding the slot suffix." into main am: 30b1c4dd3b
am: 8e60a8d6db
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2587226
Change-Id: I4fce6d31b506be94f7d1fe315884d0775c05da19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:35:31 +00:00
Treehugger Robot
d4e75d578b
Merge "Load kernel modules from /lib/modules/uname -r
_$(page_size) if present" into main
2023-08-21 20:23:01 +00:00
Treehugger Robot
8e60a8d6db
Merge "libfs_avb: Allow overriding the slot suffix." into main am: 30b1c4dd3b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2587226
Change-Id: I88647c162a1bdf4ec3bcf9564ffc6fa2b60ec762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:00:57 +00:00
Treehugger Robot
30b1c4dd3b
Merge "libfs_avb: Allow overriding the slot suffix." into main
2023-08-21 19:12:16 +00:00
Jooyung Han
646e001bb5
init: clean up DelayService()
...
ServiceList's services_update_finished flag was overlapped with the
global flag: is_default_mount_namespace_ready. Now DelayService() relies
on the is_default_mount_namespace_ready flag.
Add a service description with 'updatable' flag and invoke 'start
<name>' in 'on init' block (which comes before APEX activation).
See the log for "Cannot start an updatable service".
Bug: 293535323
Test: see the comment
Change-Id: I9341ba1a95d9b3b7c6081b530850d61f105f0a56
2023-08-21 18:37:23 +09:00
Kelvin Zhang
d479afa037
Load kernel modules from /lib/modules/uname -r
_$(page_size) if present
...
To support booting from both 4k/16k kernels, init need to tell which
kernel we are currently booting and load the right modules. To resolve
this issue, we store 16K modules into /lib/modules/`uname -r`_16k
directory.
Test: th
Bug: 293313353
Change-Id: I4a8296384537a71e16cd20e76e6c5dfb9074f574
2023-08-18 17:04:39 -07:00
Treehugger Robot
80c8c7f404
Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123
am: 5dd9d64608
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2715844
Change-Id: Ieba0cba3fe15a21290ea4535c8649c486d305b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 00:47:04 +00:00
Treehugger Robot
5dd9d64608
Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2715844
Change-Id: I120e30d5e8d9c77cef78375fde27686846cceb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 00:19:51 +00:00
Treehugger Robot
d1e04d2123
Merge "Fix uninitialized var compiler warnings" into main
2023-08-17 23:49:18 +00:00
Daniel Zheng
0ce656e198
Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9fc
am: 22e446746e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710360
Change-Id: I87e8af53582bdac271ef4526f75cfb10900ca824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 23:17:37 +00:00
Daniel Zheng
22e446746e
Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9fc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710360
Change-Id: If9c8e8ae975fdfb2b85fd8dd711a593d2d196364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 22:48:56 +00:00
Daniel Zheng
4215f1a9fc
Merge changes I5032300e,Idec3e051,I09be447b into main
...
* changes:
ZSTD read from wrong buf
Fix warning
Fix zstd optimization api usage
2023-08-17 22:32:35 +00:00
Kelvin Zhang
4b503b968c
Fix uninitialized var compiler warnings
...
Test: th
Bug: 293313353
Change-Id: I87420a21a9c2ce1987179bf70767ea15b26cd5a5
2023-08-17 15:12:49 -07:00
Daniel Zheng
36882e98b4
ZSTD read from wrong buf
...
Fix zstd to read from ignore_buf rather than buf since that is where we
are first copying the date
Test: zstd ota
Change-Id: I5032300e4628ecd7e49f1fa9f76dc9a828fb58e6
2023-08-17 14:18:56 -07:00
Daniel Zheng
21aab6cb83
Fix warning
...
remove some unused headers and fix warning: Moving a temporary object prevents copy elision
Test: m libsnapshot
Change-Id: Idec3e051837dab5f1b95e677d1cdb09e9a57e73e
2023-08-17 14:18:56 -07:00
Daniel Zheng
96b78feec1
Fix zstd optimization api usage
...
ZSTD_c_windowLog should be set as log base 2 of max block size. Changing
hardcoded value to be determined by this variable.
Test: m libsnapshot
Change-Id: I09be447b7f1e95cb72a6a42eddb4035f61a43aad
2023-08-17 14:18:55 -07:00
Daniel Zheng
4e90f52b71
Merge "Removing extra string creation for log" into main am: 7bb24d3274
am: ad63042958
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2708333
Change-Id: I0101666a4bb6403d37537e7e824430a084a8c6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 20:08:11 +00:00
Daniel Zheng
ad63042958
Merge "Removing extra string creation for log" into main am: 7bb24d3274
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2708333
Change-Id: I18b8ce294dc0c083f2a054c4bd35a76dad6418b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 19:13:22 +00:00
Daniel Zheng
7bb24d3274
Merge "Removing extra string creation for log" into main
2023-08-17 18:19:10 +00:00
Tomasz Wasilczyk
604233aaee
Merge "Revert "Revert "Remove cutils threads.h header completely.""" into main am: c05fd258ee
am: 37f0b26947
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2713394
Change-Id: I31bc04ef04737443b1c19f9bb5158e2f234bbae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:32:24 +00:00
Tomasz Wasilczyk
37f0b26947
Merge "Revert "Revert "Remove cutils threads.h header completely.""" into main am: c05fd258ee
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2713394
Change-Id: I14eeb6ae7d08d474bc1c55b09354f3ef3e79f0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:50:11 +00:00
Tomasz Wasilczyk
c05fd258ee
Merge "Revert "Revert "Remove cutils threads.h header completely.""" into main
2023-08-17 00:05:39 +00:00
Tomasz Wasilczyk
6cf9cd0123
Revert "Revert "Remove cutils threads.h header completely.""
...
This reverts commit c37838eec8
.
Reason for revert: b/296247274 root-cause fixed
Change-Id: I859e7500a1dd09e3a66986cda9e62adf5d7a524a
2023-08-16 22:37:14 +00:00
Bruce Po
d79550d8fe
Merge "Revert "Remove cutils threads.h header completely."" into main am: ef2cae13e8
am: 996bc30a27
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2712413
Change-Id: Ie157821472a5387f41ce8e005184636788412611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:11:13 +00:00
Bruce Po
996bc30a27
Merge "Revert "Remove cutils threads.h header completely."" into main am: ef2cae13e8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2712413
Change-Id: I2d3c1dd6bdb4e2f2cc34d68204eecb5ec923dfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:28:22 +00:00
Suren Baghdasaryan
3e01b70cdb
[automerger skipped] libprocessgroup: optimize SetAttributeAction::ExecuteForProcess performance am: 1e81ee1363
-s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 3483798fd9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271776
Change-Id: I15f44124d98cec700e5d9b1adcbb04029d847efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:28:21 +00:00
Suren Baghdasaryan
dd6fe056ed
[automerger skipped] libprocessgroup: fix reset of file_v2_name am: 72254810d9
-s ours
...
am skip reason: Merged-In I5b33ca47b4fa5cabf582c8804bd13f72f6e58411 with SHA-1 3507846872
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271775
Change-Id: Ia23a70becc20a4605a01442d08bc062fda018383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:28:16 +00:00
Bruce Po
ef2cae13e8
Merge "Revert "Remove cutils threads.h header completely."" into main
2023-08-16 17:47:29 +00:00
Bruce Po
c37838eec8
Revert "Remove cutils threads.h header completely."
...
This reverts commit d3550e3314
.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-qpr-dev-plus-aosp&target=aosp_sunfish-userdebug&lkgb=10667572&lkbb=10667604&fkbb=10667601 , bug http://b/296247274
Change-Id: I3f3864dc21fcb34cbb2ff524c43c3d92bd260ff6
BUG: 296247274
2023-08-16 17:38:09 +00:00
Treehugger Robot
e408e7aaea
Merge "Remove cutils threads.h header completely." into main am: 4ed0e12d55
am: b1f6f92dc2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702415
Change-Id: I43e0e1077db9b74632bf1d626829054c6db679bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:20:59 +00:00
Treehugger Robot
b1f6f92dc2
Merge "Remove cutils threads.h header completely." into main am: 4ed0e12d55
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702415
Change-Id: Iea316bc03c90089cd556546772587eed0e9442cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 16:36:26 +00:00
Treehugger Robot
4ed0e12d55
Merge "Remove cutils threads.h header completely." into main
2023-08-16 15:22:57 +00:00
Snehal Koukuntla
020c80f364
Merge "Change name to trusty-coverage-controller" into main am: 7cc9edd55c
am: be0539819c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705253
Change-Id: Ic786665c07fe734e7bd51cbf6295ef193370b68b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 10:29:34 +00:00
Snehal Koukuntla
be0539819c
Merge "Change name to trusty-coverage-controller" into main am: 7cc9edd55c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705253
Change-Id: Ib6fe43f4f69d7148443c28d1b4ffe34b9d716b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 09:45:22 +00:00