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

78491 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yi-yo Chiang
883ec23f32 Merge "adb-remount-test: Refactor raw remount & remount from scratch test" am: 78430afca4 am: 6013e1cd3d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199115

Change-Id: I4131cd8207ec348088c61927bb8aa6eca62e6909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 04:45:11 +00:00
Yi-yo Chiang
6013e1cd3d Merge "adb-remount-test: Refactor raw remount & remount from scratch test" am: 78430afca4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199115

Change-Id: I560a66119a8dc9885297417da06f3608f48f82a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 04:16:55 +00:00
Yi-yo Chiang
78430afca4 Merge "adb-remount-test: Refactor raw remount & remount from scratch test" 2022-09-05 03:34:56 +00:00
David Anderson
79ab6bbfd0 Merge "remount: Simplify fs_mgr_overlayfs_setup." am: 82e1fc0749 am: 70266efc6e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2175953

Change-Id: I44d8f22026e0f260b3aa39176eef30d93785cf2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-03 01:50:31 +00:00
David Anderson
70266efc6e Merge "remount: Simplify fs_mgr_overlayfs_setup." am: 82e1fc0749 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2175953

Change-Id: I2a7ddc49a2769795ce3408d16495762b7270ddd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-03 01:08:33 +00:00
David Anderson
82e1fc0749 Merge "remount: Simplify fs_mgr_overlayfs_setup." 2022-09-03 00:28:13 +00:00
Elliott Hughes
3ef3b327f2 Merge "Add the "sys" group for tests." am: f40607140c am: 123029cd6e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200001

Change-Id: I8faa820c7469440efbe7546f7f34a23047845468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 23:25:36 +00:00
Elliott Hughes
123029cd6e Merge "Add the "sys" group for tests." am: f40607140c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200001

Change-Id: I225a72a0551df84776801e8cbaf1d2ea71e8d20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 22:55:47 +00:00
Elliott Hughes
f40607140c Merge "Add the "sys" group for tests." 2022-09-02 22:34:56 +00:00
Jiyong Park
c573f512a5 Merge "init: remove unnecessary semicolon" am: a5dfe700b8 am: 2ba4ffcbf4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200320

Change-Id: Ie6e177159b7835a65a7b4a3c173651450f157ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 12:37:49 +00:00
Jiyong Park
2ba4ffcbf4 Merge "init: remove unnecessary semicolon" am: a5dfe700b8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200320

Change-Id: I26da9d2c13856ab7dcfaeb5f9b6fb84f35d5c549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 12:05:30 +00:00
Yi-yo Chiang
9d69a4f52a Merge "adb-remount-test: Refactor fastboot flash vendor test" am: a219a2337a am: 538a3f0a1f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2197003

Change-Id: I15f371a289f148d727398b33c5cacf0289f8e8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 11:39:12 +00:00
Jiyong Park
a5dfe700b8 Merge "init: remove unnecessary semicolon" 2022-09-02 11:39:05 +00:00
Yi-yo Chiang
538a3f0a1f Merge "adb-remount-test: Refactor fastboot flash vendor test" am: a219a2337a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2197003

Change-Id: I3ae8ec64337db21abd4f9365f88911b231705da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 11:08:13 +00:00
Yi-yo Chiang
a219a2337a Merge "adb-remount-test: Refactor fastboot flash vendor test" 2022-09-02 10:32:47 +00:00
Jooyung Han
d2a3f8a41b Merge "Removed property init.apex.<apex-name>.load/unload." am: c69bcd4a6d am: c663694e40 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199938

Change-Id: Ifb273585c9f76d8152285501317416aeea6b2613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 07:41:19 +00:00
Jooyung Han
c663694e40 Merge "Removed property init.apex.<apex-name>.load/unload." am: c69bcd4a6d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199938

Change-Id: Id60f5f46e4ee7277c21a7cc7f5684685fde6659c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 07:12:05 +00:00
Jooyung Han
c69bcd4a6d Merge "Removed property init.apex.<apex-name>.load/unload." 2022-09-02 06:46:54 +00:00
Yi-yo Chiang
e192690840 Merge "adb-remount-test: Refactor remount RW test" am: b1e4f98b96 am: 38ee10284b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194883

Change-Id: Ia2b8bd33111facf977dfa7f72ce6049ecd4203c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 06:29:01 +00:00
Yi-yo Chiang
38ee10284b Merge "adb-remount-test: Refactor remount RW test" am: b1e4f98b96 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194883

Change-Id: Id637f3d685152e530aaccc3a8b217d3e404dc1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 05:59:29 +00:00
Yi-yo Chiang
b1e4f98b96 Merge "adb-remount-test: Refactor remount RW test" 2022-09-02 05:27:21 +00:00
Yi-yo Chiang
f0a4e38670 Merge changes I4d388590,Id15844d8,Iec4224d8 am: a028455e9d am: 60d19a630c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194882

Change-Id: I43016440bfe55e36bbb77cd1df20b2b7ae79e2fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 04:58:54 +00:00
Yi-yo Chiang
60d19a630c Merge changes I4d388590,Id15844d8,Iec4224d8 am: a028455e9d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194882

Change-Id: I36b37c159d8eec902fc7ce8dd6add422e71ad4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 04:29:03 +00:00
Yi-yo Chiang
a028455e9d Merge changes I4d388590,Id15844d8,Iec4224d8 
* changes:
  adb-remount-test: Discover fstab pathname more intelligently
  adb-remount-test: Reduce noise from initial overlayfs diagnostics
  adb-remount-test: Miscellaneous fixes
 2022-09-02 04:06:19 +00:00
Deyao Ren
259b63d71c Removed property init.apex.<apex-name>.load/unload. 
Bug: 240533726
Test: atest CtsInitTestCases ApexTestCases
Change-Id: I7ed149f24dc4b116865320c85389ffe7bae6ae0d
 2022-09-01 16:14:00 +00:00
Alessandra Loro
8e096b55fa Merge "Resolve ro.debuggable at build time" am: 68e3a6f94a am: b3d6c246f5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2202438

Change-Id: Ia22fbdf7fcc47d22aeff4dc9fb691b512d0ccdcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 16:06:37 +00:00
Alessandra Loro
b3d6c246f5 Merge "Resolve ro.debuggable at build time" am: 68e3a6f94a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2202438

Change-Id: I092368bb08a3e820c054b6c2dadbd927ffb997ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 15:36:39 +00:00
Alessandra Loro
68e3a6f94a Merge "Resolve ro.debuggable at build time" 2022-09-01 14:54:36 +00:00
Alessandra Loro
7bd6dca855 Resolve ro.debuggable at build time 
Test: n/a
Bug: 243645021

Change-Id: I42c4b1e81383d83c73a565c5e74ac22f17389faf
 2022-09-01 13:32:36 +00:00
Yi-yo Chiang
a0287e2d5d Merge "adb-remount-test: Refactor remount -R & disable-verity test" am: 64198bc28f am: 997ab30e58 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191322

Change-Id: Ibeb305b16fa3384427cff24042c40d51c0836667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 10:13:02 +00:00
Yi-yo Chiang
997ab30e58 Merge "adb-remount-test: Refactor remount -R & disable-verity test" am: 64198bc28f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191322

Change-Id: I722df07c0f291a23e5166f40bc23186a27bd27dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 09:42:37 +00:00
Yi-yo Chiang
64198bc28f Merge "adb-remount-test: Refactor remount -R & disable-verity test" 2022-09-01 09:11:39 +00:00
Yi-yo Chiang
2e7e79b7b8 Merge "adb-remount-test: Refactor prologue & /sys/module/overlay mining" am: 2e0913ce6c am: 4678681472 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191105

Change-Id: Ib04e9c1a1aef9b44fceea0399de8e41186d0950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:59:33 +00:00
Yi-yo Chiang
4678681472 Merge "adb-remount-test: Refactor prologue & /sys/module/overlay mining" am: 2e0913ce6c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191105

Change-Id: I37074e54321df0836a9eb75de4d1b672b1049070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:28:05 +00:00
Yi-yo Chiang
2e0913ce6c Merge "adb-remount-test: Refactor prologue & /sys/module/overlay mining" 2022-09-01 05:45:36 +00:00
Elliott Hughes
b7475a4c3f Add the "sys" group for tests. 
It's useful to have a group that shares a numeric id with Linux and
macOS. "root" doesn't count because group 0 is actually called "wheel"
on the BSDs, and macOS has "daemon" and "kmem" as its groups 1 and 2.

This lets us have toybox tar tests that have the same results on all
supported OSes without special handling.

Test: treehugger
Change-Id: I4704d6f9ada84f3065831a099b34d1c20c4c6b03
 2022-09-01 00:01:04 +00:00
Deyao Ren
bba2acb975 Merge changes from topic "vapex_stop_service" am: e37c15e9b0 am: 898d80083a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2162760

Change-Id: I354666c432783b49ac1a539c592fdfea14a11014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 17:08:51 +00:00
Deyao Ren
898d80083a Merge changes from topic "vapex_stop_service" am: e37c15e9b0 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2162760

Change-Id: I48cec7940f792531726c2f6c8fd88406414260e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 16:39:39 +00:00
Deyao Ren
e37c15e9b0 Merge changes from topic "vapex_stop_service" 
* changes:
  Remove and add service and action during apex load and unload
  Stop services when unload an apex
 2022-08-31 16:09:43 +00:00
Yi-yo Chiang
fd3a2d9287 Merge "adb-remount-test: Refactor restore()" am: 3a6ec217c6 am: a6a2350682 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191315

Change-Id: I7bd7da208bf87e46afdfba520b7cd219ce89bd92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 08:10:34 +00:00
Yi-yo Chiang
a6a2350682 Merge "adb-remount-test: Refactor restore()" am: 3a6ec217c6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191315

Change-Id: I5dc5ffdf6fa24cc8425ac2285d6ca156ebd5d5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 07:40:58 +00:00
Yi-yo Chiang
3a6ec217c6 Merge "adb-remount-test: Refactor restore()" 2022-08-31 07:05:06 +00:00
Yi-yo Chiang
dce0b1e690 Merge changes Ie5426ff3,I04beb9e0,If90e8d1a am: 447aa1af46 am: 7e53a2dfe8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2195298

Change-Id: Ic7dc102047d13bb68c3acc084002ea19ba0aae79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 07:03:35 +00:00
Yi-yo Chiang
7e53a2dfe8 Merge changes Ie5426ff3,I04beb9e0,If90e8d1a am: 447aa1af46 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2195298

Change-Id: I6d59db32c3c1af758144091fbf4e0831fe640843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 06:34:42 +00:00
Yi-yo Chiang
447aa1af46 Merge changes Ie5426ff3,I04beb9e0,If90e8d1a 
* changes:
  adb-remount-test: Refactor check_eq & check_ne
  adb-remount-test: Add LOG() function
  adb-remount-test: Add surgically_wipe_overlayfs & is_overlayfs_mounted util
 2022-08-31 06:10:37 +00:00
Yi-Yo Chiang
2f0bcd93c2 adb-remount-test: Refactor raw remount & remount from scratch test 
Move "raw remount test" right after "disable-verity -R test".
Device is expected to be in a clean state right after disable-verity, so
we can perform "raw remount test" immediately after. This saves us one
reboot.

Move "remount from scratch test" right before "remount -R test".
Since they both require overlay teardown state, group them together so
we only need to teardown (and reboot) once. This saves us one reboot.

Total test runtime reduced by two reboots.

Bug: 243116800
Test: adb-remount-test
Change-Id: Ifd95ba713f1819a7d31e88cd70077dc306c64c58
 2022-08-31 11:33:57 +08:00
Yi-Yo Chiang
4cf5421edc adb-remount-test: Refactor fastboot flash vendor test 
Instead of relying on a local dev tree (which CI machines never have),
just pull the vendor partition image from device.
This way we can have CI coverage on fastbootd as well.

Stop redefining cleanup() hook, just toss all temporary files to $TMPDIR
and always clean up $TMPDIR on exit.

Clarify logs and error messages.

Bug: 243116800
Test: adb-remount-test
Change-Id: I08fb8df58a61c03db3274b22b51e40a1a8f41095
 2022-08-31 11:32:55 +08:00
Yi-Yo Chiang
7da7fa4d09 adb-remount-test: Refactor remount RW test 
* Check mount flag changes (ro/rw) before and after "adb remount".
* Add comment explaining what's going on with the |uses_dynamic_scratch|
  and |scratch_partition| variables.
* Add rich logs reporting infomation about the scratch partition.
* Add rich error messages.
* Filter out /data devices and external volumes (vold managed device)
  when checking RW partitions. We are only interested in system
  partitions.
* Remove redundant "remount from setup" test from end-of-file, as they
  are testing the same thing as the refactored remount test. Total test
  runtime reduced by one reboot.

Bug: 243116800
Test: adb-remount-test
Change-Id: Icda5bff78372bebfe2e166d8537a06be66fff886
 2022-08-31 11:32:55 +08:00
Yi-Yo Chiang
9a636d2a85 adb-remount-test: Discover fstab pathname more intelligently 
Pick exactly one fstab file whose pathname suffix matches one of the
fstab suffix properties.
This helps on CF who ships redundant copies of fstab.

Bug: 243116800
Test: adb-remount-test
Change-Id: I4d38859014161e14dba1f7e19dbce44a2621d0f1
 2022-08-31 11:32:55 +08:00
Yi-Yo Chiang
7b126377b2 adb-remount-test: Refactor remount -R & disable-verity test 
Since remount -R and disable-verity -R have similar expectations, group
them together and reuse each other's test code.
Remove the redundant "remount -R" test at end of file.
Total test runtime reduced by one reboot.

Bug: 243116800
Test: adb-remount-test
Change-Id: I510a9de39f94b73450df9abf82a55496df96bea1
 2022-08-31 11:32:54 +08:00