Suren Baghdasaryan
794b981823
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours am: 2b8e48240e -s ours
...
am: 61130815a1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifd3004be0ccab309fbd241f127c74d44edd3a2ff
2019-01-25 09:40:04 -08:00
Suren Baghdasaryan
61130815a1
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours
...
am: 2b8e48240e -s ours
am skip reason: subject contains skip directive
Change-Id: I032c0d13df8e02ba2ee52616d32c0a0066dc79e7
2019-01-25 09:28:07 -08:00
Suren Baghdasaryan
2b8e48240e
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""
...
am: 5342de92e0 -s ours
am skip reason: subject contains skip directive
Change-Id: I27e126950c7a76f473e5450451e12d36eaa92ad5
2019-01-25 09:18:11 -08:00
Suren Baghdasaryan
5342de92e0
Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""
2019-01-25 17:09:02 +00:00
Suren Baghdasaryan
0ca607c4cd
DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""
...
This reverts commit 9ce1d14ef6 .
Reason for revert: AOSP is fixed with new vendor image
Change-Id: Ie5a9748acdae22a2b9862cb2ecedda7031f77264
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-25 05:43:59 +00:00
Suren Baghdasaryan
985070ed98
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours am: 56d6cf2c94 -s ours
...
am: d631ac484d -s ours
am skip reason: subject contains skip directive
Change-Id: Iae08ba2a67f9ce5804a819e6b3ae84c0ce3ced8d
2019-01-23 23:27:19 -08:00
Suren Baghdasaryan
d631ac484d
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours
...
am: 56d6cf2c94 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbbd4ba3de9c9f7725cd4a2232df9c83be09686b
2019-01-23 23:14:43 -08:00
Suren Baghdasaryan
56d6cf2c94
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
...
am: 7548e0d6fa -s ours
am skip reason: subject contains skip directive
Change-Id: I6ccebe2066001865d5d57b3e11f8b72827fd4e4d
2019-01-23 23:05:33 -08:00
Suren Baghdasaryan
7548e0d6fa
Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
2019-01-24 06:57:55 +00:00
Ng Zhi An
3de293f4a2
Merge "Check that install file exists before unlink" am: 05d48050c1 am: a04ff295cf
...
am: 737e6cc600
Change-Id: I5c6e484133c16e472941c81b63ef0f7e78e4f71b
2019-01-23 21:58:18 -08:00
Ng Zhi An
737e6cc600
Merge "Check that install file exists before unlink" am: 05d48050c1
...
am: a04ff295cf
Change-Id: I00c9323e3c774f25d4c746e439d8c50bb75935b6
2019-01-23 21:54:11 -08:00
Ng Zhi An
a04ff295cf
Merge "Check that install file exists before unlink"
...
am: 05d48050c1
Change-Id: I2a216be7e2f055cc520405bd49f67c3dc18bc542
2019-01-23 21:47:17 -08:00
Treehugger Robot
05d48050c1
Merge "Check that install file exists before unlink"
2019-01-24 05:35:51 +00:00
Suren Baghdasaryan
9ce1d14ef6
DO NOT MERGE: Revert "Add libprocessgroup dependency"
...
This reverts commit 62d0c7873c .
Reason for revert: Broke AOSP
Change-Id: I88ef00ebce797f7fdca3678ab93fcae364453a8c
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-23 20:46:46 -08:00
Ng Zhi An
14417a5d2a
Check that install file exists before unlink
...
This will remove spurious error messages in logcat such as:
08-02 00:27:21.580 600 600 E /system/bin/recovery-persist: Failed to
unlink /data/misc/recovery/last_install: No such file or directory
since the install file doesn't exist in the first place.
Bug: None
Test: m
Change-Id: Ifaa95729c50efae4e641286dfbe1718aceb5f50a
2019-01-23 15:16:29 -08:00
Suren Baghdasaryan
734dd91a48
[automerger skipped] Merge "Add libprocessgroup dependency" am: 4475f7330a am: bd36c3a8ec
...
am: 73a460b06f -s ours
am skip reason: change_id I7cf75e473ee1e2837940606c71d15be26db0c3f2 with SHA1 79f4680e4d is in history
Change-Id: Iac56fd9de1905a5e224ff883dc98e9a4cd831d9e
2019-01-22 14:08:40 -08:00
Suren Baghdasaryan
73a460b06f
Merge "Add libprocessgroup dependency" am: 4475f7330a
...
am: bd36c3a8ec
Change-Id: Ib573f07c3a42d2e39f805e8a7dfda03d9f01d79f
2019-01-22 13:42:44 -08:00
Suren Baghdasaryan
bd36c3a8ec
Merge "Add libprocessgroup dependency"
...
am: 4475f7330a
Change-Id: Ia7d2a6c5d4bfb511e6417eaf1e81f76108415c6f
2019-01-22 13:04:21 -08:00
Suren Baghdasaryan
4475f7330a
Merge "Add libprocessgroup dependency"
2019-01-22 20:58:15 +00:00
Suren Baghdasaryan
62d0c7873c
Add libprocessgroup dependency
...
Because set_sched_policy is moved into libprocessgroup an additional
dependency is requred for recovery_component_test to build.
Exempt-From-Owner-Approval: janitorial
Bug: 111307099
Test: builds, boots
Merged-In: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Change-Id: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-20 22:04:43 +00:00
Suren Baghdasaryan
79f4680e4d
Add libprocessgroup dependency
...
Because set_sched_policy is moved into libprocessgroup an additional
dependency is requred for recovery_component_test to build.
Exempt-From-Owner-Approval: janitorial
Bug: 111307099
Test: builds, boots
Change-Id: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-17 02:42:38 +00:00
Hridya Valsaraju
2f216f3993
Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd am: f1fd5ec266
...
am: 5792ea8690
Change-Id: I2068f1c6a029c31d86415ab98a42b588d7bde68d
2019-01-16 18:35:14 -08:00
Hridya Valsaraju
5792ea8690
Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd
...
am: f1fd5ec266
Change-Id: I8593bdf9366e72bc165117fc1fe8414567984661
2019-01-16 18:02:46 -08:00
Hridya Valsaraju
f1fd5ec266
Merge "e2fsck_static is no longer needed for remount"
...
am: 725d7f8dfd
Change-Id: Ie67ab328d10aebd078a1a41fe48b79f6d4467ebe
2019-01-16 17:58:41 -08:00
Treehugger Robot
725d7f8dfd
Merge "e2fsck_static is no longer needed for remount"
2019-01-17 01:43:33 +00:00
Hridya Valsaraju
6f44c11357
e2fsck_static is no longer needed for remount
...
Remount will instead use overlayfs. If the device is not configured
to use overlayfs or if the device does not support dynamic partitions
but has chosed to setup an ext4-dedupe filesystem, e2fsck_static must
then be included in recovery.
Bug: 122115286
Test: fastboot flashall
Change-Id: I931282dbc67ff4ef53291bcbc5a078b500e5e807
2019-01-16 23:42:55 +00:00
Tao Bao
a70556178e
Merge "screen_ui: Trivial fix to append newline when logging." am: 594a63cc9d am: fadc163b60
...
am: 8df7ff0026
Change-Id: I7ac89722d144556e5b52b2d0f40d80682ae63a6a
2019-01-16 15:41:55 -08:00
Tao Bao
8df7ff0026
Merge "screen_ui: Trivial fix to append newline when logging." am: 594a63cc9d
...
am: fadc163b60
Change-Id: I8ccdaf85363fe03a59bd79dd67d5755c9a2d9f72
2019-01-16 15:36:51 -08:00
Tao Bao
fadc163b60
Merge "screen_ui: Trivial fix to append newline when logging."
...
am: 594a63cc9d
Change-Id: Ib2c433d68cbb38627b1b40919428ba337f617fe6
2019-01-16 15:27:44 -08:00
Tao Bao
594a63cc9d
Merge "screen_ui: Trivial fix to append newline when logging."
2019-01-16 23:14:09 +00:00
Tao Bao
a00b449e1f
screen_ui: Trivial fix to append newline when logging.
...
Noticed while debugging other issues.
Test: Boot and check recovery.log.
Change-Id: Id92265cff287b9de89efe5eea85581e63e31aeb2
2019-01-16 09:31:12 -08:00
Yifan Hong
fec7ff6300
Merge "updater: add functions to modify dynamic partition metadata" am: 27aa9404fc am: 4def1e8a54
...
am: dc97097fc0
Change-Id: Ie39a637a7f0c17374435118eec211b08f63dc3e6
2019-01-15 16:50:12 -08:00
Yifan Hong
dc97097fc0
Merge "updater: add functions to modify dynamic partition metadata" am: 27aa9404fc
...
am: 4def1e8a54
Change-Id: I6d9d00e94329b69ab13a526a83fe9ffb47b46978
2019-01-15 16:42:36 -08:00
Yifan Hong
4def1e8a54
Merge "updater: add functions to modify dynamic partition metadata"
...
am: 27aa9404fc
Change-Id: I0b432e53aba06129b01b34b56e169f05a564b77c
2019-01-15 16:26:47 -08:00
Yifan Hong
27aa9404fc
Merge "updater: add functions to modify dynamic partition metadata"
2019-01-16 00:10:58 +00:00
Yifan Hong
fed4ded442
Merge "Create stash dir recursively." am: 7a0b65472b am: 32932a48f9
...
am: 6f366ee4dd
Change-Id: I49e75d8ac06bf80447b205e9cd2e040c191ee106
2019-01-14 14:20:09 -08:00
Yifan Hong
6f366ee4dd
Merge "Create stash dir recursively." am: 7a0b65472b
...
am: 32932a48f9
Change-Id: Id2b155a768e5cec4486bd778fa26a7cc4fe32602
2019-01-14 14:11:09 -08:00
Yifan Hong
8ff84d7cfb
updater: add functions to modify dynamic partition metadata
...
Test: sideload full OTA on cuttlefish
Test: sideload incremental OTA on cuttlefish (that grows
system, shrinks vendor, and move vendor to group foo)
Test: verify that /cache/recovery/cc46ebfd04058569d0c6c1431c6af6c1328458e4
exists (sha1sum of "system")
Bug: 111801737
Change-Id: Ibdf6565bc1b60f3665c01739b4c95a85f0261ae5
2019-01-14 14:01:13 -08:00
Yifan Hong
32932a48f9
Merge "Create stash dir recursively."
...
am: 7a0b65472b
Change-Id: I6f47807075044e6e71078db99988190ced32e157
2019-01-14 13:40:35 -08:00
Yifan Hong
7a0b65472b
Merge "Create stash dir recursively."
2019-01-14 20:56:57 +00:00
Yifan Hong
63f5260c6c
Create stash dir recursively.
...
When applying an OTA package onto the device in OTA mode,
if the recovery logs haven't been viewed, there is a chance
that /cache/recovery does not exist. Then, stash creation will
fail. Create stash directories recursively to avoid this error.
Test: without /cache/recovery, sideload the OTA on cuttlefish
Change-Id: I5cc01a067d866476a3594e795dcb5b15649e817b
2019-01-11 15:13:22 -08:00
Tao Bao
0c92531f58
Merge "Use dynamically linked f2fs executables." am: 22a27f9965 am: ad4ce79b4d
...
am: e8270a8e98
Change-Id: If041789192af362b2683a076763f044bfb9b0c2b
2019-01-08 12:13:48 -08:00
Tao Bao
e8270a8e98
Merge "Use dynamically linked f2fs executables." am: 22a27f9965
...
am: ad4ce79b4d
Change-Id: I0fc7309dc6ab5a87d26677a0ed9f0d5c6f288b7a
2019-01-08 12:09:43 -08:00
Tao Bao
ad4ce79b4d
Merge "Use dynamically linked f2fs executables."
...
am: 22a27f9965
Change-Id: If4ed2288a513510569ce9411a20cdc4c962d9803
2019-01-08 12:05:29 -08:00
Tao Bao
22a27f9965
Merge "Use dynamically linked f2fs executables."
2019-01-08 19:49:20 +00:00
Yifan Hong
2f3a0ba775
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91 am: 159d267cc6
...
am: d2e801fb93
Change-Id: I8626208127ccdb245823a5db40e9fe6583c63ea0
2019-01-07 17:28:52 -08:00
Yifan Hong
d2e801fb93
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91
...
am: 159d267cc6
Change-Id: I7dd0df6adbe7315326064e5b660432dc60be6495
2019-01-07 17:17:40 -08:00
Yifan Hong
159d267cc6
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"
...
am: 08a8b40c91
Change-Id: Iee6860b0dbeaafc06ca881148ca4ea99abaf4b3a
2019-01-07 17:11:37 -08:00
Yifan Hong
08a8b40c91
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"
2019-01-08 00:06:40 +00:00
Yifan Hong
363d624d53
updater: erase ignores EOPNOTSUPP for BLKDISCARD
...
Test: sideload on cuttlefish
Bug: 111801737
Change-Id: I784a2142049054f38d6b70c7af7e88a451996d83
2019-01-04 15:24:52 -08:00