ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
84706 commits 1 branch 0 tags 217 MiB
Commit graph

84706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yi-Yo Chiang
87a59dcfc8 Merge "init: Use libfs_mgr kernel cmdline parser" into main am: 63a3f34e4c am: 3cffba1bed am: 3224ee59b6 am: 456e3f8da7 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2687407

Change-Id: I03501445136ac0af50ed680e60cb0c16dc394d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 06:39:01 +00:00
Yi-Yo Chiang
7e2aef6b4d Merge "remount: Replace ServiceManager::getService with checkService" into main am: 4131a3afd1 am: 18cea8df37 am: 9365d00cf2 am: a8a84f49af 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2690886

Change-Id: I5ddf72684ffdd17e9c86ec825d0b3466cf35f166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 06:38:49 +00:00
Yi-Yo Chiang
456e3f8da7 Merge "init: Use libfs_mgr kernel cmdline parser" into main am: 63a3f34e4c am: 3cffba1bed am: 3224ee59b6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2687407

Change-Id: I275d0f33c0af001550078d06686f1c7994d1c363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 05:54:01 +00:00
Yi-Yo Chiang
a8a84f49af Merge "remount: Replace ServiceManager::getService with checkService" into main am: 4131a3afd1 am: 18cea8df37 am: 9365d00cf2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2690886

Change-Id: Icca016b6f21de335a0417cd57e9fc9486724d7bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 05:53:50 +00:00
Yi-Yo Chiang
3224ee59b6 Merge "init: Use libfs_mgr kernel cmdline parser" into main am: 63a3f34e4c am: 3cffba1bed 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2687407

Change-Id: I5131b5f3dd9de4e5f02c69df42ab301d0bd3c321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 05:04:56 +00:00
Yi-Yo Chiang
9365d00cf2 Merge "remount: Replace ServiceManager::getService with checkService" into main am: 4131a3afd1 am: 18cea8df37 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2690886

Change-Id: I677dd4b109cc5a6f0c0be953f0a4d6b17eb7546b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 05:04:43 +00:00
Yi-Yo Chiang
3cffba1bed Merge "init: Use libfs_mgr kernel cmdline parser" into main am: 63a3f34e4c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2687407

Change-Id: I774523069e97413b11d23bb28491f907e7ec6c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 04:22:42 +00:00
Yi-Yo Chiang
18cea8df37 Merge "remount: Replace ServiceManager::getService with checkService" into main am: 4131a3afd1 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2690886

Change-Id: I0edade2adc78401e6f5291d1a2a579ac102d2087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 04:22:27 +00:00
Yi-Yo Chiang
63a3f34e4c Merge "init: Use libfs_mgr kernel cmdline parser" into main 2023-08-04 03:46:07 +00:00
Yi-Yo Chiang
4131a3afd1 Merge "remount: Replace ServiceManager::getService with checkService" into main 2023-08-04 03:31:33 +00:00
David Anderson
8b2180c7aa Merge "libsnapshot: Fix missing return keyword in error path." into main am: c8ce6347db am: c7b9ece0c4 am: 4b3dbfda96 am: eaf8162212 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2691212

Change-Id: Id7f0f6bc0b1eac294bfce18e85002d3006e3e565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 22:00:48 +00:00
Treehugger Robot
ab1bdda5ee Merge "Remove references to the pdk product variable" into main am: 0950447d18 am: ecc86c1f93 am: 7d7e5b745f am: d2bf245183 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692949

Change-Id: I45b9b1bc55bbc65a1ea5fc54df79d214aa8a79d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 21:58:20 +00:00
David Anderson
eaf8162212 Merge "libsnapshot: Fix missing return keyword in error path." into main am: c8ce6347db am: c7b9ece0c4 am: 4b3dbfda96 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2691212

Change-Id: I758c20623e8c92b9262ecfc89f48f36b4796d7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 21:19:26 +00:00
Treehugger Robot
d2bf245183 Merge "Remove references to the pdk product variable" into main am: 0950447d18 am: ecc86c1f93 am: 7d7e5b745f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692949

Change-Id: I003d88fc9880999fdf1822674fc00dc5fed039c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 21:18:03 +00:00
David Anderson
4b3dbfda96 Merge "libsnapshot: Fix missing return keyword in error path." into main am: c8ce6347db am: c7b9ece0c4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2691212

Change-Id: Ife0f3683daf168bb4cfb74a8c90b13983217ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 20:34:18 +00:00
Treehugger Robot
7d7e5b745f Merge "Remove references to the pdk product variable" into main am: 0950447d18 am: ecc86c1f93 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692949

Change-Id: I01c4e8ea63227ad53dd62a7c83c9dd83ca1e0d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 20:32:32 +00:00
David Anderson
c7b9ece0c4 Merge "libsnapshot: Fix missing return keyword in error path." into main am: c8ce6347db 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2691212

Change-Id: I223ac6defc12d300f9cee99cdb6c46831487343f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:52:25 +00:00
Treehugger Robot
ecc86c1f93 Merge "Remove references to the pdk product variable" into main am: 0950447d18 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692949

Change-Id: Ib1681df19e0c2829066cdc69ba81ed46c9a9470b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:49:15 +00:00
David Anderson
c8ce6347db Merge "libsnapshot: Fix missing return keyword in error path." into main 2023-08-03 18:57:37 +00:00
Treehugger Robot
0950447d18 Merge "Remove references to the pdk product variable" into main 2023-08-03 18:56:33 +00:00
Cole Faust
355ae4154e Remove references to the pdk product variable 
pdk is deprecated and has no effect as of aosp/1319667.

Test: Presubmits
Change-Id: I78d7afaaa71b93e575dcd5c20716ffb295b9f522
 2023-08-03 10:54:59 -07:00
David Anderson
fbc5f59737 libsnapshot: Fix missing return keyword in error path. 
Bug: 288273605
Test: vts_libsnapshot_test
Change-Id: I0bee5ee1ebfb61f17d2a495440048d02e2c347b1
 2023-08-03 09:45:20 -07:00
Yi-Yo Chiang
2336e5f06b Merge "init: Unify kernel bootconfig parser with libfs_mgr" into main am: f2368d0744 am: 67e3e637a4 am: 710ae65506 am: 614b091ef4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682016

Change-Id: I1797d61935b64966ecec7153387d57b54bb2b6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 11:15:31 +00:00
Yi-Yo Chiang
614b091ef4 Merge "init: Unify kernel bootconfig parser with libfs_mgr" into main am: f2368d0744 am: 67e3e637a4 am: 710ae65506 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682016

Change-Id: I3305189dd173c0d8ddb39cee1b9bed248a412938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 10:31:06 +00:00
Yi-Yo Chiang
710ae65506 Merge "init: Unify kernel bootconfig parser with libfs_mgr" into main am: f2368d0744 am: 67e3e637a4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682016

Change-Id: Iaf9dbb798635602a7531b44b9bbe967254834d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 09:46:40 +00:00
Yi-Yo Chiang
67e3e637a4 Merge "init: Unify kernel bootconfig parser with libfs_mgr" into main am: f2368d0744 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682016

Change-Id: I9f4d70d3202c35d1ec8686efb6658dfe250fd60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 08:44:05 +00:00
Yi-Yo Chiang
f2368d0744 Merge "init: Unify kernel bootconfig parser with libfs_mgr" into main 2023-08-03 07:54:14 +00:00
Mitchell Wills
d7eeb79fde Merge "Add logs in SuperLayoutBuilder::Open when the metadata isn't supported" into main am: b7cfba1ca2 am: cf244ae185 am: 9c1acfcc78 am: a4a9e92243 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2665257

Change-Id: I164d1f2ac788b1a72233b7945255674494d69264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 19:45:02 +00:00
Mitchell Wills
a4a9e92243 Merge "Add logs in SuperLayoutBuilder::Open when the metadata isn't supported" into main am: b7cfba1ca2 am: cf244ae185 am: 9c1acfcc78 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2665257

Change-Id: I774b3f719409c55fa7af1d4836bdfec4d0128fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 18:59:49 +00:00
Mitchell Wills
9c1acfcc78 Merge "Add logs in SuperLayoutBuilder::Open when the metadata isn't supported" into main am: b7cfba1ca2 am: cf244ae185 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2665257

Change-Id: I96295a0348c89f6d7f47691fe4bf1732cafe7aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 18:15:37 +00:00
Yi-Yo Chiang
59442132d1 remount: Replace ServiceManager::getService with checkService 
Address this build log message:
```
[ 18% 2/11] //system/core/fs_mgr:remount clang++ fs_mgr_remount.cpp
system/core/fs_mgr/fs_mgr_remount.cpp:133:31: warning: 'getService' is deprecated: this polls for 5s, prefer waitForService or checkService [-Wdeprecated-declarations]
        if (auto binder = sm->getService(android::String16("vold"))) {
                              ^
```

Bug: 293695109
Test: adb-remount-test
Change-Id: I3b5c7d338e9307dee58edeb0f6a00ba9a73d46f6
 2023-08-02 18:01:19 +00:00
Mitchell Wills
cf244ae185 Merge "Add logs in SuperLayoutBuilder::Open when the metadata isn't supported" into main am: b7cfba1ca2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2665257

Change-Id: Ifa7f47c7e5f464f05cc6429f801fa6176c6f7fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 17:34:38 +00:00
Mitchell Wills
b7cfba1ca2 Merge "Add logs in SuperLayoutBuilder::Open when the metadata isn't supported" into main 2023-08-02 16:30:04 +00:00
Yi-Yo Chiang
bbd3f5c34d Merge "init: Unify duplicated get_android_dt_dir with libfs_mgr" into main am: 0b30e34a04 am: 5d6e684874 am: e8ae45bccf am: f5891d3eae 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675395

Change-Id: I49a0271d7c899c7a03449f1070b8ee2183ce3163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 12:46:43 +00:00
Yi-Yo Chiang
f5891d3eae Merge "init: Unify duplicated get_android_dt_dir with libfs_mgr" into main am: 0b30e34a04 am: 5d6e684874 am: e8ae45bccf 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675395

Change-Id: Ia465eecd8565134e1a2b2876aca6bef53fcfa68b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 12:06:54 +00:00
Yi-Yo Chiang
e8ae45bccf Merge "init: Unify duplicated get_android_dt_dir with libfs_mgr" into main am: 0b30e34a04 am: 5d6e684874 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675395

Change-Id: Ie843bb8e700336769b60d27a10d2916135f75531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 11:20:09 +00:00
Yi-Yo Chiang
5d6e684874 Merge "init: Unify duplicated get_android_dt_dir with libfs_mgr" into main am: 0b30e34a04 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675395

Change-Id: Ie92ec1006c0af058e809867aded4a7303ee0a67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 10:38:20 +00:00
Yi-Yo Chiang
da5323e2d6 init: Use libfs_mgr kernel cmdline parser 
Bug: 293695109
Test: CtsFsMgrTestCases
Change-Id: Ie2567d84cb80c392ad68aef0c438d8acc03a311e
 2023-08-02 17:59:05 +08:00
Yi-Yo Chiang
79ad1e2e9b init: Unify kernel bootconfig parser with libfs_mgr 
Right now there are two bootconfig parsers that gets linked into `init`.
One is from libinit itself and the other is from libfs_mgr.

The one in libinit removes all space characters between list elements,
so `key = "val1", "val2"` gets unquoted and squeezed into:
  `key=val1,val2`
The one in libfs_mgr doesn't remove spaces, it only unquotes:
  `key=val1, val2`

The libinit behavior is due to existing systems (such as sysprop)
expect the config value to be in the same format as kernel cmdline.
(aosp/1757971)
THe libfs_mgr behavior is due to the `androidboot.boot_device[s]`
format explicitly allows quoted comma appear in its list value, thus
relies on space, not comma, as the list value delimeter.

This commit merges the two parsers into libfs_mgr. Since all usages in
libfs_mgr besides `boot_device[s]` do not care about how list value are
delimited, and most usages in init expects the bootconfig value format
to be the same format as cmdline. We just special case the
`boot_device` scenario.

Also harden the test cases to cover all the different config value
format and expected result.

Note:
The format of kernel bootconfig is described here
https://docs.kernel.org/admin-guide/bootconfig.html

Bug: 293695109
Test: CtsFsMgrTestCases
Change-Id: I42b9bf626e8de38a60e8e09fac0693126b7efd91
 2023-08-02 09:57:37 +00:00
Yi-Yo Chiang
0b30e34a04 Merge "init: Unify duplicated get_android_dt_dir with libfs_mgr" into main 2023-08-02 09:56:36 +00:00
David Anderson
b6bb8a4484 Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot." into main am: c99cd86610 am: 633e1f51d6 am: 5adf18b67e am: d551f66470 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2670618

Change-Id: If556bdf928b254de7202f08b0bfc49ef86fdf3ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 19:33:48 +00:00
David Anderson
d551f66470 Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot." into main am: c99cd86610 am: 633e1f51d6 am: 5adf18b67e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2670618

Change-Id: I21704d936dbb0713ca2c8bb3d07e0f096fe9b176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 18:47:51 +00:00
David Anderson
5adf18b67e Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot." into main am: c99cd86610 am: 633e1f51d6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2670618

Change-Id: I0788a0cabfc682e6635aaef7214af2a39126a6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 18:01:37 +00:00
David Anderson
633e1f51d6 Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot." into main am: c99cd86610 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2670618

Change-Id: I2ab1a051bb12d7a2d125a78483c1547b1b3e10ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 17:18:55 +00:00
David Anderson
c99cd86610 Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot." into main 2023-08-01 16:35:44 +00:00
David Anderson
a637416a87 libsnapshot: Introduce a dynamically linked version of libsnapshot. 
This will cut down on the binary sizes of update_engine, snapshotctl,
and lpdumpd.

Bug: 291688516
Test: treehugger
Change-Id: Idae5ea075ab21c2bd4fdb839eb065d865cb07d58
 2023-08-01 16:35:38 +00:00
Jooyung Han
25020cbaaf Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main am: deff223842 am: 2e438b3a5d am: 4c8b9529a5 am: 68c1dc5bd9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2685548

Change-Id: I393b0a778894a87141600a8f15693e8371ac3a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 13:24:14 +00:00
Jooyung Han
68c1dc5bd9 Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main am: deff223842 am: 2e438b3a5d am: 4c8b9529a5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2685548

Change-Id: I666280236e3d66cc36a07f9dc0b6b9db54a7d697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 12:42:05 +00:00
Jooyung Han
4c8b9529a5 Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main am: deff223842 am: 2e438b3a5d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2685548

Change-Id: Id71c2e5ffa44d6ccefdcc15b20848243423f1832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 12:00:11 +00:00
Jooyung Han
2e438b3a5d Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main am: deff223842 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2685548

Change-Id: Ie8f8741baff37b992952a0cbc3da41b6ad3f80df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 11:19:12 +00:00