Yi-yo Chiang
c3e43e63fe
Merge "first_stage_mount: Bind mount /system after switch root" am: 53f1fab6ac
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146960
Change-Id: I6f8029284650238dcca3727cb9be81d486a9d314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 10:08:01 +00:00
Yi-yo Chiang
53f1fab6ac
Merge "first_stage_mount: Bind mount /system after switch root"
2022-07-18 09:47:56 +00:00
Treehugger Robot
f8415fdc19
Merge "first_stage_mount: Fix log typo "check_at_most_once"" am: 4bc5277152
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146961
Change-Id: Id41980ebd8e4ec7353def81828f0138374858a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 06:18:51 +00:00
Treehugger Robot
4bc5277152
Merge "first_stage_mount: Fix log typo "check_at_most_once""
2022-07-18 05:58:42 +00:00
Yi-Yo Chiang
a3832d496b
first_stage_mount: Fix log typo "check_at_most_once"
...
Was "check_most_at_once", should be "check_at_most_once".
Also straighten the if-then-else logic from:
if (cond) {
// then
} else {
// error...
return;
}
to:
if (!cond) {
// error...
return;
}
// fallthrough is "then"
Test: Presubmit
Change-Id: I85c1e94c47a727089374d5d05ecd40f4187b66a1
2022-07-18 04:38:02 +00:00
Jooyung Han
db126b9a4e
Merge "Return Result<T> from Do(Un)LoadApex()" am: 46fa45d82c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155095
Change-Id: Ib73a4ed9cfb73ebd26cd03d2c3119aab5f17c5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16 03:19:31 +00:00
Jooyung Han
46fa45d82c
Merge "Return Result<T> from Do(Un)LoadApex()"
2022-07-16 02:49:06 +00:00
Jooyung Han
a2fe3e577e
Return Result<T> from Do(Un)LoadApex()
...
For consistent error message. This is a preparation step for the
follow-up change: to generate linker configuration in DoLoadApex()
Bug: 232173613
Test: CtsInitTestCases
Change-Id: I27954ae2429e82da1bde1925ef62b277c24129d3
2022-07-16 08:37:06 +09:00
Christopher Ferris
e6c462d209
Merge "Revert "Add support for only starting 64 bit zygote."" am: 86cc51ae60
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155013
Change-Id: Ic0251c315a947f5f810fe38c84650a528f892ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 00:34:51 +00:00
Jooyung Han
000b85449c
Merge "init starts servicemanagers in "default" mount ns" am: e89c457157
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2153354
Change-Id: I9fcb98938403626697ea5b515e1f5d2c82fbefd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 00:34:25 +00:00
Christopher Ferris
86cc51ae60
Merge "Revert "Add support for only starting 64 bit zygote.""
2022-07-15 00:24:10 +00:00
Jooyung Han
e89c457157
Merge "init starts servicemanagers in "default" mount ns"
2022-07-15 00:12:55 +00:00
Treehugger Robot
ec82a203b3
Merge "boot_reason: Add reasons for boot_reason_test.sh" am: 45545c68d1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146968
Change-Id: I580841352ffb21a7310d53f9386ce0d79dda7304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 22:58:25 +00:00
Treehugger Robot
45545c68d1
Merge "boot_reason: Add reasons for boot_reason_test.sh"
2022-07-14 22:45:18 +00:00
Christopher Ferris
3fa3f861d4
Revert "Add support for only starting 64 bit zygote."
...
This reverts commit da94c7f650 .
Reason for revert: It appears this change slows down boot on normal devices.
Technically, this change is not necessary, but it prevents starting the secondary and having it throw an error in the only run 64 bit zygote config. But it's easier to throw the error than slow down boot up.
Bug: 238971179
Test: Verified that on a 64 with 32 config, the secondary zygote
Test: starts but exits.
Change-Id: I7ab0496a402db83e70168d52e5d5911b82a3b06a
2022-07-14 22:13:29 +00:00
David Anderson
1cf73b36ec
Merge changes I29453595,I6586c8e5 am: 0f7b66b604
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2152062
Change-Id: I08bfb087b39942fb3fe1620aa1a18899470eca67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 17:49:27 +00:00
Treehugger Robot
5c4ea3dc51
Merge "bootstat: add more bootreasons" am: 2b0c119bff
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2151576
Change-Id: I426b6991d2bb4329937838c02b0406a7ca86445c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 17:49:13 +00:00
David Anderson
0f7b66b604
Merge changes I29453595,I6586c8e5
...
* changes:
vts_fs_test: Only require EROFS in T+ kernels.
Revert "Do not enforce EROFS for android-T and below."
2022-07-14 17:33:08 +00:00
Treehugger Robot
2b0c119bff
Merge "bootstat: add more bootreasons"
2022-07-14 17:27:29 +00:00
Jooyung Han
c5fa15e08c
init starts servicemanagers in "default" mount ns
...
servicemanager/hwservicemanager are pre-apexd services but still wants
to see VINTF fragments from APEXes, especially from /data.
Like ueventd, these services need to be started in "default" mount
namespace.
Bug: 237672865
Test: m && boot
Change-Id: I0266c5be5530a1a07f8ffa23a26186d45a55613f
2022-07-14 18:31:21 +09:00
David Anderson
c2f95c4b79
vts_fs_test: Only require EROFS in T+ kernels.
...
Bug: 237765186
Test: vts_fs_test
Change-Id: I294535953bfbe0f246347487b746d3adf2fca1aa
2022-07-13 16:45:11 -07:00
David Anderson
ffda48e959
Revert "Do not enforce EROFS for android-T and below."
...
This reverts commit a571d4a9bc .
Reason for revert: Incorrect fix
Change-Id: I6586c8e53cc89418d1802807a1a2e108f7e825d3
2022-07-13 16:36:43 -07:00
Elliott Hughes
594a67ce35
Merge "Add support for only starting 64 bit zygote." am: 1012626192
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2061509
Change-Id: I16d2104ef124cd3bee86923f36c80352117ff69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 20:19:00 +00:00
Elliott Hughes
1012626192
Merge "Add support for only starting 64 bit zygote."
2022-07-13 19:57:47 +00:00
Jone Chou
11160ed297
bootstat: add more bootreasons
...
add more bootreasons for new platform
Bug: 236191641
Test: trigger apc watchdog then "adb root; adb shell bootstat -p"
Change-Id: I8bbbe57e6c70959a4ec848b59065d0ee9fca50db
2022-07-13 17:13:16 +00:00
Treehugger Robot
e03286ac40
Merge "Add ctl.apex_(un)load properties to (un)load apex" am: e271146ec8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146970
Change-Id: I26a3865aaaae2ded31c84e701a0a6fe3592b65a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 04:20:59 +00:00
Treehugger Robot
e271146ec8
Merge "Add ctl.apex_(un)load properties to (un)load apex"
2022-07-13 04:04:20 +00:00
Treehugger Robot
5591ee3531
Merge "Replace deprecated atoms.proto file path" am: b718a4372b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146967
Change-Id: Id2aeda77fcaa664f703e945a7b869eba33e8fb3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 02:21:27 +00:00
Treehugger Robot
b718a4372b
Merge "Replace deprecated atoms.proto file path"
2022-07-13 02:06:14 +00:00
Treehugger Robot
e591c7d174
Merge "Make 'mkbootfs' print a usage message for insufficent args." am: 4cc0cb2b62
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2152273
Change-Id: Iee4fc68cf029e2ee5bfae73ffab89715d2c88386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 01:08:21 +00:00
Treehugger Robot
4cc0cb2b62
Merge "Make 'mkbootfs' print a usage message for insufficent args."
2022-07-13 00:49:33 +00:00
jiajia tang
52f9adf176
boot_reason: Add reasons for boot_reason_test.sh
...
Add "power_on_key" and "power_on_cable" to match
heuristics in system/core/bootstat/bootstat.cpp
Change-Id: I947026d658c8a385aab7a3ade9efacffb9538d56
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2022-07-13 00:36:15 +00:00
Mateus Azis
023f67b95e
Make 'mkbootfs' print a usage message for insufficent args.
...
Right now, it just prints "no directories to process". There is also no
indication anywhere about the availability of the -f and -d flags.
Also took the opportunity to perform small quality-of-life improvements,
like updating error messages, hiding internal functions.
Test: (cd system/core/mkbootfs && mma) && ./out/host/linux-x86/bin/mkbootfs
Change-Id: Ia81eff0308e6e2686dde979d47c0bf938afbaf82
2022-07-12 16:00:07 -07:00
Treehugger Robot
11b2028a39
Merge "Add zhangkelvin@ as owner of fastboot" am: 0c1fdc1a09
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2151834
Change-Id: I8def0a41c146076a98509112f0297bf6fdfb1db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 19:11:56 +00:00
Treehugger Robot
0c1fdc1a09
Merge "Add zhangkelvin@ as owner of fastboot"
2022-07-12 18:38:20 +00:00
Akilesh Kailash
57a6216c6b
Merge "libsnapshot: Fix vts_libsnapshot_test.SnapshotUpdateTest#FullUpdateFlow" am: 58f66339ef
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2150260
Change-Id: Ia0755fc6686de7cfb0eb2bc3d52296789cb16f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 18:07:07 +00:00
Treehugger Robot
666b847b17
Merge "Convert fastboot/libsnapshot to new BootControl client" am: c29f0745d5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2132796
Change-Id: I75dd91acaf0d051d4a114b2fcdc822d4ed66a453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 18:06:57 +00:00
Kelvin Zhang
1fcdce21d6
Add zhangkelvin@ as owner of fastboot
...
Working on replacing aio w/ liburing in fastboot recently
Change-Id: I8076e2e53dc8d620faf9bff7f37ba2d2538460d6
2022-07-12 11:05:33 -07:00
Akilesh Kailash
58f66339ef
Merge "libsnapshot: Fix vts_libsnapshot_test.SnapshotUpdateTest#FullUpdateFlow"
2022-07-12 17:53:09 +00:00
Treehugger Robot
c29f0745d5
Merge "Convert fastboot/libsnapshot to new BootControl client"
2022-07-12 17:47:20 +00:00
Sandeep Dhavale
906ebf775c
Merge "Print OTA merge progress state in logs" am: f607e37fd0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2150256
Change-Id: I80f0a829281b9dfc031dbd0f9440a4094109e2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 17:32:13 +00:00
Sandeep Dhavale
f607e37fd0
Merge "Print OTA merge progress state in logs"
2022-07-12 17:12:23 +00:00
Pete Bentley
4e245edf96
Merge "Move boringssl self tests from early-init to init." am: 00bf9dcb01
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2148027
Change-Id: Icc07f5446583b26b15b43092762f4f38ecfe09d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 10:31:09 +00:00
Pete Bentley
00bf9dcb01
Merge "Move boringssl self tests from early-init to init."
2022-07-12 09:50:40 +00:00
Treehugger Robot
06bf4e25ee
Merge "Do not enforce EROFS for android-T and below." am: eebd7f2b7d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146826
Change-Id: Icaa0f8645f329ffeb417785be48f8f93f6e1eb90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 07:04:09 +00:00
Treehugger Robot
eebd7f2b7d
Merge "Do not enforce EROFS for android-T and below."
2022-07-12 06:39:59 +00:00
jiajia tang
f083957850
Replace deprecated atoms.proto file path
...
Path of "frameworks/base/cmds/statsd/src/atoms.proto"
is out of date. Latest path is
"frameworks/proto_logging/stats/atoms.proto".
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: Ib9471e812466238d79e836b026123f167aaad701
2022-07-12 06:01:44 +00:00
Akilesh Kailash
bfbd9b0e6e
libsnapshot: Fix vts_libsnapshot_test.SnapshotUpdateTest#FullUpdateFlow
...
Check if compression feature is enabled.
Bug: 238143011
Test: OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I77663799a5371f1de8b4e29d7c777a24249d1b7b
2022-07-12 05:23:48 +00:00
Sandeep Dhavale
5bdb9dbb79
Print OTA merge progress state in logs
...
Currently OTA merge process prints enum values in logs in numerical
form. This patch changes the log messages from numerical enums to
more friendly names.
Test: Manual OTA
===========Logs==========
CheckTargetMergeState for vendor_dlkm_b returned: Merging
ProcessUpdateState handling state: Merging
CheckTargetMergeState for product_b returned: Merging
CheckTargetMergeState for vendor_dlkm_b returned: MergeCompleted
ProcessUpdateState handling state: Merging
CheckTargetMergeState for product_b returned: MergeCompleted
ProcessUpdateState handling state: MergeCompleted
Bug: 234518211
Change-Id: If690d3ea86e6fe37e8b3e4bd52e87b70ae92495c
2022-07-12 03:40:11 +00:00
Treehugger Robot
592de2a382
Merge "Don't kill subcontext if it's null" am: 932e069f0f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146830
Change-Id: Ib839545df89ff9b6c6b554d7429c2f6e602a32f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11 07:17:30 +00:00