Tao Bao
264caac23d
Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1
...
am: f93a103587
Change-Id: I43a23f5bf16feb9a70379c0e1f23892215abc30e
2017-07-27 17:43:12 +00:00
Tao Bao
f93a103587
Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d
...
am: dcd272fbb1
Change-Id: I6983e9df9c4e7d4740050d69fd2522639c2c673d
2017-07-27 17:41:10 +00:00
Tao Bao
dcd272fbb1
Merge "roots.cpp: Clean up format_volume()."
...
am: 8eef26cf3d
Change-Id: I0cf7d7cf82f4e14567b585b2603ba387a8f94231
2017-07-27 17:38:45 +00:00
Tao Bao
8eef26cf3d
Merge "roots.cpp: Clean up format_volume()."
2017-07-27 17:33:48 +00:00
Jin Qian
3475faf5ea
recovery: handle security footer before passing size to mke2fs
...
am: 5e47d5161a -s ours
Change-Id: I5b9bafb850261ce95cf69fd0323f9104e33babea
2017-07-25 23:23:31 +00:00
Tao Bao
3c00facb3d
roots.cpp: Clean up format_volume().
...
Test: m -j bootable/recovery
Test: Wipe data/cache in recovery
Change-Id: I11a4bf34015e903992ae2fb100d0b59a9fb75e03
2017-07-25 15:26:32 -07:00
Tao Bao
b0e8a507ac
Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7
...
am: 1bc6334312
Change-Id: Ib794876faa040993e6b6d128fae28f80bfa91566
2017-07-25 22:05:23 +00:00
Tao Bao
1bc6334312
Merge "Remove LOCAL_CLANG" am: 231c627a55
...
am: 1d510671c7
Change-Id: Ia4f78dc67bc2fac65eba6bb23a273eb3575d9dce
2017-07-25 22:01:24 +00:00
Tao Bao
1d510671c7
Merge "Remove LOCAL_CLANG"
...
am: 231c627a55
Change-Id: Idfd30503b9ebd8e3d59af7ab703911a500ad6c09
2017-07-25 21:58:22 +00:00
Tao Bao
231c627a55
Merge "Remove LOCAL_CLANG"
2017-07-25 21:46:36 +00:00
Jin Qian
5e47d5161a
recovery: handle security footer before passing size to mke2fs
...
mke2fs doesn't take negative size as reserved size. If footer is
specified, compute fs size to be
(max partition size - reserved footer size) / block_size
Bug: 23686092
Bug: 63968011
Merged-In: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
Change-Id: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
(cherry picked from commit f3ccad58dd )
2017-07-25 21:09:02 +00:00
Lennart Wieboldt
5e5e334b3b
Remove LOCAL_CLANG
...
clang is the default compiler since Android nougat
Change-Id: I930bba431dc49970cb4491ed5fcf44b5e00e97df
Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de >
2017-07-25 21:48:39 +02:00
Jin Qian
6e99b91fd0
Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6
...
am: 2b95e0d0aa
Change-Id: Ic0ba2478daddb56382b06e321ff11209b8702576
2017-07-25 19:31:42 +00:00
Jin Qian
2b95e0d0aa
Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1
...
am: 786177f7e6
Change-Id: Ie10ad843cab2b7c12529a5f2ac361b4884890cf8
2017-07-25 19:27:41 +00:00
Jin Qian
786177f7e6
Merge "recovery: handle security footer before passing size to mke2fs"
...
am: 539ed9acb1
Change-Id: Iba9eab601be27fe68c6895ca09f4ff2ee3957501
2017-07-25 19:23:40 +00:00
Treehugger Robot
539ed9acb1
Merge "recovery: handle security footer before passing size to mke2fs"
2017-07-25 19:16:01 +00:00
Tao Bao
ed4abe576b
Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d
...
am: 28cf022931
Change-Id: Ib045e79f32ff46481ab3c4305a60581ad45d8404
2017-07-25 19:15:40 +00:00
Tao Bao
28cf022931
Merge "updater: Remove dead make_parents()." am: f5396eb8b2
...
am: ac634e3c9d
Change-Id: I0e230a00ffd077177562d71fa54f5f9bd7718f4f
2017-07-25 19:12:40 +00:00
Tao Bao
ac634e3c9d
Merge "updater: Remove dead make_parents()."
...
am: f5396eb8b2
Change-Id: Ief0557813324d49c5da64265dc49ab757ed3ae3f
2017-07-25 19:09:40 +00:00
Tao Bao
df9252faf7
Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33
...
am: a40c15717d
Change-Id: I2b6120ab9c2defddbb5a7a72ee6269c005a12b4b
2017-07-25 19:05:09 +00:00
Treehugger Robot
f5396eb8b2
Merge "updater: Remove dead make_parents()."
2017-07-25 19:02:44 +00:00
Tao Bao
a40c15717d
Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016
...
am: 276ff4cc33
Change-Id: I0ce7b6bdc85d17d38b9e2a1332556f90b80926a6
2017-07-25 19:01:08 +00:00
Tao Bao
276ff4cc33
Merge "recovery: Fix the flickering when turning on text mode."
...
am: 771dfb0016
Change-Id: Ic85356b782c6b83725d85f2104fb30fc81ad2ed1
2017-07-25 18:57:38 +00:00
Treehugger Robot
771dfb0016
Merge "recovery: Fix the flickering when turning on text mode."
2017-07-25 18:51:33 +00:00
Tao Bao
7022f33ec8
recovery: Fix the flickering when turning on text mode.
...
When there's no command specified when booting into debuggable builds
(such as using `adb reboot recovery`), we turn on the text mode (i.e.
recovery menu) directly. This CL fixes the issue to avoid showing the
background image in a flash while turning on the text mode.
Bug: 63985334
Test: `fastboot boot $OUT/recovery.img` and it shows the recovery menu
directly without the no command image in a flash.
Change-Id: Id86bbe346ab76c8defc95e2b423e695a86774b09
2017-07-25 09:59:31 -07:00
Jin Qian
f3ccad58dd
recovery: handle security footer before passing size to mke2fs
...
mke2fs doesn't take negative size as reserved size. If footer is
specified, compute fs size to be
(max partition size - reserved footer size) / block_size
Bug: 23686092
Bug: 63968011
Change-Id: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
2017-07-25 09:11:09 -07:00
Tao Bao
5902691764
updater: Remove dead make_parents().
...
Its former callers in RenameFn() and SymlinkFn() have been removed in
commit 63d786cf22 .
Test: mmma -j bootable/recovery
Change-Id: I26ed126202554fc5840811ec7ae162da70593213
2017-07-25 08:42:52 -07:00
Tao Bao
9c62f67863
Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9
...
am: 633aeba594
Change-Id: I9833741fe5d785298d7f99f6b2c9539723f8fcd1
2017-07-25 14:35:50 +00:00
Tao Bao
633aeba594
Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9
...
am: 993cec5cc9
Change-Id: Iec927cd9ff2f85e898fa034239641e733e119a49
2017-07-25 14:32:20 +00:00
Tao Bao
993cec5cc9
Merge "otautil: Delete dirUnlinkHierarchy()."
...
am: 031661d4a9
Change-Id: I33a793646f6f11757afc20f16fd3a0f700dd09fb
2017-07-25 14:28:52 +00:00
Tao Bao
031661d4a9
Merge "otautil: Delete dirUnlinkHierarchy()."
2017-07-25 14:11:28 +00:00
Tao Bao
11e6d8ee85
Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36
...
am: bba1e66f74
Change-Id: Id965c1752f56b81d0d9e2e98bd3a9a4a393c73c1
2017-07-25 08:16:57 +00:00
Tao Bao
bba1e66f74
Merge "roots.cpp: Reformatting the file." am: ac70ffcc85
...
am: 922a310d36
Change-Id: I120503c0e8a726abc044344a17bd9e0c584200c9
2017-07-25 08:13:26 +00:00
Tao Bao
922a310d36
Merge "roots.cpp: Reformatting the file."
...
am: ac70ffcc85
Change-Id: Ia658b14b12286a07c878f639763d9d83fa48fabf
2017-07-25 08:09:13 +00:00
Tao Bao
7934985e0c
otautil: Delete dirUnlinkHierarchy().
...
This function has become obsolete since we've removed file-based OTA
support (it was needed by 'delete_recursive' edify function earlier).
Test: mmma -j bootable/recovery
Test: Code search shows no active user of the function.
Change-Id: If6faaa759d4c849b79acba4e6adb82baadc89f7a
2017-07-24 20:35:48 -07:00
Treehugger Robot
ac70ffcc85
Merge "roots.cpp: Reformatting the file."
2017-07-25 03:19:39 +00:00
Tao Bao
bb10e58eb1
roots.cpp: Reformatting the file.
...
Mostly cosmetic changes. Removed the use of errno, and added constness
to a few pointers.
format_volume() and exec_cmd() will be cleaned up in a separate CL.
Test: mmma -j bootable/recovery
Change-Id: Ia12ce25a91c0bdd0e319f6da02ce1dc8377f265d
2017-07-24 17:15:41 -07:00
Tao Bao
2357b0c745
Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331
...
am: 0148a6f9ab
Change-Id: Id568b7cb5043c444f88032368be57a6f128a44c7
2017-07-24 18:32:01 +00:00
Tao Bao
0148a6f9ab
Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c
...
am: dbe9da5331
Change-Id: I87bb6d92a00b97e05b35736e5b9f247101bbac11
2017-07-24 18:29:30 +00:00
Tao Bao
dbe9da5331
Merge "tests: Add a test to cover legacy care_map.txt handling."
...
am: 6eb23c594c
Change-Id: Iaad43cb44f4c406e4c07c9399e70e96cbaa4db7b
2017-07-24 18:27:00 +00:00
Tao Bao
6eb23c594c
Merge "tests: Add a test to cover legacy care_map.txt handling."
2017-07-24 18:23:52 +00:00
Tao Bao
c319613e06
tests: Add a test to cover legacy care_map.txt handling.
...
This is to cover the code added by commit
5a1dee01df , where an O update_verifier
should not reject N care_map.txt.
Bug: 63544345
Test: recovery_component_test passes on marlin.
Change-Id: Ia944e16cba3cc635098b3ffd92842d725b570fec
2017-07-24 09:34:06 -07:00
Tao Bao
c580e491ca
Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c
...
am: 1d923f5e54
Change-Id: I61ebcbb04c989342f48bd53927fafc5e634fdfa8
2017-07-24 16:33:02 +00:00
Tao Bao
1d923f5e54
Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3
...
am: fdb5d1cd8c
Change-Id: Ia75dbbe4ebf2f4e595f5a50937d831d36c81fe2c
2017-07-24 16:27:32 +00:00
Tao Bao
fdb5d1cd8c
Merge "update_verifier: Handle legacy care_map.txt gracefully."
...
am: 15ae0f01c3
Change-Id: I7a175533cd3710d978b20245817a01a73a3f575d
2017-07-24 16:22:32 +00:00
Tao Bao
15ae0f01c3
Merge "update_verifier: Handle legacy care_map.txt gracefully."
2017-07-24 16:13:14 +00:00
Tao Bao
0be4c0e261
Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca
...
am: fd63239621
Change-Id: Ie1721fb7264b3c7277770f5bb44781880ce32f12
2017-07-23 04:11:05 +00:00
Tao Bao
fd63239621
Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be
...
am: 248b4f9dca
Change-Id: Idd17e7d036ef7f92c687441e56f1e5c98c6f6b0c
2017-07-23 04:07:34 +00:00
Tao Bao
248b4f9dca
Merge "Remove the obsolete reference to /file_contexts."
...
am: 6b09b895be
Change-Id: I2b26ced9ffeb278ce01ff2ca7be4057b0ab6c61c
2017-07-23 04:03:34 +00:00
Treehugger Robot
6b09b895be
Merge "Remove the obsolete reference to /file_contexts."
2017-07-23 03:56:42 +00:00