Commit graph

74280 commits

Author SHA1 Message Date
Treehugger Robot
5a1c3012a7 Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575 am: a86dec2fe6 am: 0c0fe62ff9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473

Change-Id: Ifecdc575a53897c7fb378cba8a9cbebfc57484be
2022-01-12 03:26:46 +00:00
Treehugger Robot
0c0fe62ff9 Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575 am: a86dec2fe6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473

Change-Id: Ib95d3997a4cbff1741bbd4a5479a4fb3d1c84535
2022-01-12 03:12:10 +00:00
Treehugger Robot
a86dec2fe6 Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473

Change-Id: Ife8656d14abbf2b297f53bdc40791e73c1dcb73b
2022-01-12 03:01:49 +00:00
Treehugger Robot
da0756b575 Merge "healthd: remove hridya@ from OWNERS file" 2022-01-12 02:34:11 +00:00
Ken Chen
721cd61571 Merge "Delete legacy library libqtaguid" am: 67b528f521 am: b118319a65 am: e0bfad3b20
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282

Change-Id: I6d12d3bb8eb0d08dbac774e7085538106f40ed36
2022-01-11 19:23:36 +00:00
Ken Chen
e0bfad3b20 Merge "Delete legacy library libqtaguid" am: 67b528f521 am: b118319a65
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282

Change-Id: I71540b8339b68e8598d2c661a71d38e2af4ac668
2022-01-11 19:06:49 +00:00
Ken Chen
b118319a65 Merge "Delete legacy library libqtaguid" am: 67b528f521
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282

Change-Id: I855a958154c8069ab718dc04802774c854b94995
2022-01-11 17:48:04 +00:00
Ken Chen
67b528f521 Merge "Delete legacy library libqtaguid" 2022-01-11 17:30:41 +00:00
Yi-yo Chiang
4b21c590b5 Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a am: 5099a91634 am: bc906626ad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283

Change-Id: I6718b849e63227e2781df23bf82f8ed343219632
2022-01-11 07:44:57 +00:00
Yi-yo Chiang
bc906626ad Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a am: 5099a91634
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283

Change-Id: I6868bbb3d8a5b14a79e8186cfdba63d5f92e1e70
2022-01-11 07:31:14 +00:00
Yi-yo Chiang
5099a91634 Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283

Change-Id: I83c93807433081c75d089aed912543fcb6d62364
2022-01-11 07:11:25 +00:00
Yi-yo Chiang
1eeee3db1a Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" 2022-01-11 06:57:25 +00:00
Yi-yo Chiang
93432daac5 Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214 am: ce0cdb1a58 am: 51c240f5c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852

Change-Id: Iaa99b4612c502b776a9910db0e6cf6b3d4289b89
2022-01-11 06:32:36 +00:00
Yi-yo Chiang
51c240f5c4 Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214 am: ce0cdb1a58
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852

Change-Id: Ie228dbaf68e03849b16bf09fab32896cdcb83d9d
2022-01-11 06:01:34 +00:00
Yi-yo Chiang
ce0cdb1a58 Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852

Change-Id: I79cbbee8b26a85bf3a2aaa34b8c2acbdefc2f782
2022-01-11 05:49:02 +00:00
Yi-yo Chiang
c126ad8214 Merge "libfs_avb: Export more utilities to facilitate VTS" 2022-01-11 05:36:25 +00:00
Bowgo Tsai
be4a609948 Merge "libfs_avb: updating run_tests.sh" am: f452a42db2 am: 9520bbf5de am: c3984d5e77
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373

Change-Id: I894f88fc4c5bbf383ad03db0f8bd286e9c882a3b
2022-01-11 05:06:42 +00:00
Treehugger Robot
7bd679ca7e Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d am: e68a3e7299 am: d2cb0b0ea6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881

Change-Id: I61e6627ea673e405dc01df39b26024788180a08f
2022-01-11 05:05:34 +00:00
Bowgo Tsai
c3984d5e77 Merge "libfs_avb: updating run_tests.sh" am: f452a42db2 am: 9520bbf5de
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373

Change-Id: Ied32bc655a5105b99bc91d185489add5068ae105
2022-01-11 04:40:40 +00:00
Treehugger Robot
d2cb0b0ea6 Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d am: e68a3e7299
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881

Change-Id: I9cded9bf3973402f9eee40b274a441a9efd9bd5a
2022-01-11 04:39:32 +00:00
Bowgo Tsai
9520bbf5de Merge "libfs_avb: updating run_tests.sh" am: f452a42db2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373

Change-Id: I2d68d8d01d30006bf1a97f4080a7560bf186b63f
2022-01-11 04:22:35 +00:00
Treehugger Robot
e68a3e7299 Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881

Change-Id: I9658fe384fdde89b8fdb9a97ba03fb9867c67095
2022-01-11 04:21:56 +00:00
Jaegeuk Kim
098322aae5 Merge "Allow to run fsck.f2fs in first_stage_ramdisk" am: 8b7e76962e am: 4cdd4089a5 am: 90e5745845
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943363

Change-Id: I39e34935a06a876071083429cc0673f3ee3582ba
2022-01-11 04:06:47 +00:00
Bowgo Tsai
f452a42db2 Merge "libfs_avb: updating run_tests.sh" 2022-01-11 04:01:39 +00:00
Treehugger Robot
0b5bfdce7d Merge "fastboot: make init_boot.img optional" 2022-01-11 03:54:31 +00:00
Jaegeuk Kim
90e5745845 Merge "Allow to run fsck.f2fs in first_stage_ramdisk" am: 8b7e76962e am: 4cdd4089a5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943363

Change-Id: Ib5a7e2bea8cd2b4ef6cd8d52768ec57f5abf55b6
2022-01-11 03:48:48 +00:00
Jaegeuk Kim
4cdd4089a5 Merge "Allow to run fsck.f2fs in first_stage_ramdisk" am: 8b7e76962e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943363

Change-Id: I0ea4746d4a772572b64235c52b2efc8e69e4a538
2022-01-11 03:00:54 +00:00
Jaegeuk Kim
8b7e76962e Merge "Allow to run fsck.f2fs in first_stage_ramdisk" 2022-01-11 02:30:14 +00:00
Devin Moore
60bd33ffd5 fastboot: make init_boot.img optional
Older devices don't build this image because they don't have a partition
for it.

Bug: N/A
Test: m
Change-Id: I56b58c1bc137ce25e426aa4ec6d2303fa7d77ccc
2022-01-11 02:02:59 +00:00
Treehugger Robot
3cdaec9d84 Merge changes from topic "adb-remount-f2fs" am: e0fa2905d0 am: 1fc547baf1 am: 7562e11442
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943366

Change-Id: If2c9cc0d3512df4ebbfd5143be7060134e8f0f6e
2022-01-11 01:33:11 +00:00
Treehugger Robot
7562e11442 Merge changes from topic "adb-remount-f2fs" am: e0fa2905d0 am: 1fc547baf1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943366

Change-Id: Ic31c8cbd2bbed7251cd02fd4bfacc23470033c5b
2022-01-11 01:12:50 +00:00
Treehugger Robot
1fc547baf1 Merge changes from topic "adb-remount-f2fs" am: e0fa2905d0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943366

Change-Id: Ifa05ae81886146136172b335e3298f4178409bac
2022-01-11 00:46:40 +00:00
Treehugger Robot
e0fa2905d0 Merge changes from topic "adb-remount-f2fs"
* changes:
  Mount /mnt/scracth with -o sync,nodiscard
  Run check_fs only /data is mounted
  Don't use FSCK_LOG_FILE used for ext4 only
  Don't try to mount if the disk has no FS magic
  Retry to unmount /data
2022-01-11 00:27:35 +00:00
Pirama Arumuga Nainar
7703d26e7e Merge "Enable continuous coverage: use '%c' specifier in LLVM_PROFILE_FILE" am: f9a54a86ec am: 8a7b296501 am: 78825506d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1729634

Change-Id: If6ecb21915078335c17dd4af3a6e60b54382b208
2022-01-10 23:30:27 +00:00
Pirama Arumuga Nainar
78825506d9 Merge "Enable continuous coverage: use '%c' specifier in LLVM_PROFILE_FILE" am: f9a54a86ec am: 8a7b296501
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1729634

Change-Id: I30edff87c41d5ceb0e9164adf33fde7a6c59804a
2022-01-10 23:07:31 +00:00
Pirama Arumuga Nainar
8a7b296501 Merge "Enable continuous coverage: use '%c' specifier in LLVM_PROFILE_FILE" am: f9a54a86ec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1729634

Change-Id: I38d350391163f86156a8f65016693284ddc18849
2022-01-10 22:54:34 +00:00
Pirama Arumuga Nainar
f9a54a86ec Merge "Enable continuous coverage: use '%c' specifier in LLVM_PROFILE_FILE" 2022-01-10 22:36:57 +00:00
Jaegeuk Kim
b783310e71 Allow to run fsck.f2fs in first_stage_ramdisk
[   23.065933][    T1] init: [libfs_mgr]Running /system/bin/fsck.f2fs -a -c 10000 --debug-cache /dev/block/sda8
[   23.067470][    T1] logwrapper: Cannot log to file /dev/fscklogs/log
[   23.067829][    T1] logwrapper:
[   23.068997][  T332] logwrapper: executing /system/bin/fsck.f2fs failed: Permission denied
[   23.069759][    T1] fsck.f2fs: executing /system/bin/fsck.f2fs failed: Permission denied
[   23.071659][  T332] logwrapper:
[   23.083283][    T1] fsck.f2fs: fsck.f2fs terminated by exit(255)
[   23.083283][    T1]
[   23.111166][    T1] F2FS-fs (sda8): Found nat_bits in checkpoint
[   23.121242][    T1] F2FS-fs (sda8): Mounted with checkpoint version = 6a65cb64
[   23.121831][    T1] init: [libfs_mgr]__mount(source=/dev/block/platform/14700000.ufs/by-name/metadata,target=/metadata,type=f2fs)=0: Success

Bug: 210589189
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I720e2aa4b1ab845af96610cd0d9c6e3c9b4cae03
2022-01-10 21:35:21 +00:00
Jaegeuk Kim
bbad87aeee Mount /mnt/scracth with -o sync,nodiscard
"-o discard" issues UNMAP commands to loopback resulting in punch_hole
on the pinned file in /data. That will break the pinned block map.

Bug: 210589189
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ia927c43fc75164ce5929173f5740737eac4de484
2022-01-10 21:34:00 +00:00
Jaegeuk Kim
06db803f32 Run check_fs only /data is mounted
After switching to /system from ramdisk, first_stage_init has no required
libraries for check_fs.

[   20.838811][    T1] init: [libfs_mgr]Created logical partition scratch on device /dev/block/dm-6
[   20.972704][    T1] init: [libfs_mgr]Running /system/bin/fsck.f2fs -a -c 10000 --debug-cache /dev/block/dm-6
[   20.977879][  T345] logwrapper: executing /system/bin/fsck.f2fs failed: No such file or directory
[   20.978470][    T1] fsck.f2fs: executing /system/bin/fsck.f2fs failed: No such file or directory
[   20.981137][    T1] fsck.f2fs: fsck.f2fs terminated by exit(255)
[   21.002958][    T1] init: [libfs_mgr]__mount(source=/dev/block/dm-6,target=/mnt/scratch,type=f2fs)=0: Success
[   21.017748][    T1] init: [libfs_mgr]umount(/mnt/scratch)
[   21.021028][    T1] init: [libfs_mgr]Running /system/bin/fsck.f2fs -a -c 10000 --debug-cache /dev/block/dm-6
[   21.028759][  T347] logwrapper: executing /system/bin/fsck.f2fs failed: No such file or directory
[   21.028793][    T1] fsck.f2fs: executing /system/bin/fsck.f2fs failed: No such file or directory
[   21.049100][    T1] fsck.f2fs: fsck.f2fs terminated by exit(255)
[   21.068101][    T1] init: [libfs_mgr]__mount(source=/dev/block/dm-6,target=/mnt/scratch,type=f2fs)=0: Success

Bug: 210589189
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ie41cba4e7553860fdb48996d9b58a34093f0b723
2022-01-10 21:33:50 +00:00
Jaegeuk Kim
d595de5139 Don't use FSCK_LOG_FILE used for ext4 only
Bug: 210589189
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Iaf7a61c6c9c6cd557f953b1a665e7a1640d357ae
2022-01-10 21:31:46 +00:00
Treehugger Robot
01e7120fcd Merge "Remove win_sdk" am: afd4ccd70b am: 84e4de7d4a am: 11bb816e0d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1941100

Change-Id: Ia1e4175e602a9d75438c8fd046aaaee0cf230f60
2022-01-10 21:09:26 +00:00
Treehugger Robot
11bb816e0d Merge "Remove win_sdk" am: afd4ccd70b am: 84e4de7d4a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1941100

Change-Id: I67e5eace96aa7c9e7da2d563b7a5c4c185dd24e0
2022-01-10 20:57:20 +00:00
Treehugger Robot
84e4de7d4a Merge "Remove win_sdk" am: afd4ccd70b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1941100

Change-Id: Ic8329df9b616367ff6e23ee0be63b1057b15d372
2022-01-10 20:39:18 +00:00
Treehugger Robot
afd4ccd70b Merge "Remove win_sdk" 2022-01-10 20:18:16 +00:00
Jaegeuk Kim
9547726f4a Don't try to mount if the disk has no FS magic
This avoids:
[   22.932529][    T1] init: [libfs_mgr]Invalid f2fs superblock on '/dev/block/platform/14700000.ufs/by-name/metadata'
[   22.934609][    T1] F2FS-fs (sda8): Magic Mismatch, valid(0xf2f52010) - read(0x0)
[   22.935061][    T1] F2FS-fs (sda8): Can't find valid F2FS filesystem in 1th superblock
[   22.937306][    T1] F2FS-fs (sda8): Magic Mismatch, valid(0xf2f52010) - read(0x0)
[   22.943700][    T1] F2FS-fs (sda8): Can't find valid F2FS filesystem in 2th superblock
[   22.951937][    T1] init: [libfs_mgr]__mount(source=/dev/block/platform/14700000.ufs/by-name/metadata,target=/metadata,type=f2fs)=-1: Invalid argument

Bug: 210589189
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I27989b25769eae83eb06ac86146f27baf288b7e1
2022-01-10 18:02:03 +00:00
Jaegeuk Kim
bdb981d113 Retry to unmount /data
If we fail to umount /data, device won't boot up at all.

Bug: 208161227
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I92d34a253039eb677d4df9fad8a0821fbc684f57
2022-01-10 09:50:23 -08:00
Yi-Yo Chiang
0c99f93351 Remove unused rootdir/avb/*-gsi.avbpubkey modules
They were moved to test/vts-testcase

Bug: 176869478
Test: presubmit
Change-Id: I4f4f1c50e624125c839161d83e28f051099e6ec0
2022-01-10 14:25:42 +00:00
Yi-yo Chiang
d20afb51bd Merge "Move *-gsi_avbpubkey filegroup to vts directory" am: 28d7b767a9 am: e23ae1ae39 am: 21737ef489
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938281

Change-Id: If34f22a53a3290bbfa3aa2a592fb1a669e41432d
2022-01-10 09:14:28 +00:00
Yi-yo Chiang
21737ef489 Merge "Move *-gsi_avbpubkey filegroup to vts directory" am: 28d7b767a9 am: e23ae1ae39
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938281

Change-Id: Ic2e3d8ebaff996d685d5b1b0873849748b0ffcb9
2022-01-10 08:53:14 +00:00