Tianjie Xu
6eae2f7023
Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15
...
am: 12cd28fb9c
Change-Id: Id9b37ba12cfc534f9b59eac78bf1476e6f7a72a3
2017-08-03 18:48:45 +00:00
Tianjie Xu
12cd28fb9c
Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b
...
am: e500bc3e15
Change-Id: Ibee36f11ef600685881bb2f652216196f323ed8d
2017-08-03 18:35:23 +00:00
Tianjie Xu
e500bc3e15
Merge "Refactor the imgdiff" am: f411f3dcfb
...
am: 6c1a6c389b
Change-Id: Ifc13d6c9fad007909f49192a8e34d37083c0a682
2017-08-03 18:29:25 +00:00
Tianjie Xu
6c1a6c389b
Merge "Refactor the imgdiff"
...
am: f411f3dcfb
Change-Id: I2b99c2f0f0c117451db80324670590f96fbbb1da
2017-08-03 18:24:08 +00:00
Tianjie Xu
f411f3dcfb
Merge "Refactor the imgdiff"
2017-08-03 18:12:23 +00:00
Tianjie Xu
6b03ba7902
Refactor the imgdiff
...
This helps us to add a new mode to handle large APKs in the follow
up CL.
Changes include:
1. Create a new interface class 'Image'
1. Create subclasses 'ZipModeImage' and 'ImageModeImage' and move the
related functions there.
Bug: 63542719
Test: recovery_component_test passes
Change-Id: I7729b0ba39b19a9c84811636a60dd0a0b1acc2f0
2017-08-02 14:29:45 -07:00
Tianjie Xu
fd0e740c61
Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310 am: a09376ed90
...
am: 8b09001e47
Change-Id: Ib1c74e9295cf2c2f22a47135a24a884037a31555
2017-08-01 00:41:51 +00:00
Tianjie Xu
8b09001e47
Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310
...
am: a09376ed90
Change-Id: I67b2f4e91133239d4eb35524c7f0ed41f18de8dc
2017-08-01 00:38:21 +00:00
Tianjie Xu
a09376ed90
Merge "Add implemention of SortedRangeSet" am: 64cba55fbc
...
am: fbd4b10310
Change-Id: I2c6bc65375be433e79db8861e3c5e936847c897e
2017-08-01 00:34:49 +00:00
Tianjie Xu
fbd4b10310
Merge "Add implemention of SortedRangeSet"
...
am: 64cba55fbc
Change-Id: I2174e4f55c85fe57014b31625dbc2d06e41350be
2017-08-01 00:31:20 +00:00
Tianjie Xu
64cba55fbc
Merge "Add implemention of SortedRangeSet"
2017-08-01 00:22:33 +00:00
Tianjie Xu
b9e7fc7fa9
Add implemention of SortedRangeSet
...
This is useful in imgdiff to maintain the block ranges of
splitted source image.
Bug: 34220646
Test: mma && unit tests pass
Change-Id: I6427f2ea50f0e3b0aa3dd01880ec0206679b7429
2017-07-31 15:13:55 -07:00
Tao Bao
cee984b929
Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c am: 0863373376
...
am: 06db7363b0
Change-Id: Ie474f91d9ab7b9c64c2fd9ecb1930a767ceb8e84
2017-07-31 00:25:13 +00:00
Tao Bao
06db7363b0
Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c
...
am: 0863373376
Change-Id: Ia2326bca2d8a1344fccd2838e2b376cb9a843a82
2017-07-31 00:21:43 +00:00
Tao Bao
0863373376
Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b
...
am: 5507c3d63c
Change-Id: I811f76004d8b0346746c25d05ee4b2fda635a352
2017-07-31 00:18:43 +00:00
Tao Bao
5507c3d63c
Merge "otautil: Clean up dirCreateHierarchy()."
...
am: 610712101b
Change-Id: I95350c4b2aab36dd89ea7813f2eb63d407b5f8ac
2017-07-31 00:15:43 +00:00
Treehugger Robot
610712101b
Merge "otautil: Clean up dirCreateHierarchy()."
2017-07-31 00:10:34 +00:00
Tianjie Xu
181d514cf1
Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829b
...
am: ce47e3792f
Change-Id: I36e058c5f1337cd032ce561634dcf5b8a9193ce4
2017-07-27 21:42:00 +00:00
Tianjie Xu
ce47e3792f
Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229
...
am: a86d24829b
Change-Id: I841cd10a129cc95ca52b92708d844bfcc5adcdea
2017-07-27 21:37:33 +00:00
Tianjie Xu
a86d24829b
Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4
...
am: 6f30535229
Change-Id: Iba392936c14c0af584b0dcb94bc65670cb94473e
2017-07-27 21:34:00 +00:00
Tianjie Xu
6f30535229
Merge "Add more specific error codes for uncrypt failures"
...
am: 3ff8a5e2a4
Change-Id: Iee5b01f59b2e0532232393c0133f0bd3b11d9ccd
2017-07-27 21:31:52 +00:00
Tianjie Xu
3ff8a5e2a4
Merge "Add more specific error codes for uncrypt failures"
2017-07-27 21:29:17 +00:00
Tianjie Xu
8b8e23d5cc
Add more specific error codes for uncrypt failures
...
Add the error codes when we fail to find the realpath, or fail to find
the block_device.
Bug: 63737759
Test: mma
Change-Id: Icf15368ad3e7345c747d9083da2f049cc8acd571
2017-07-27 21:28:18 +00:00
Tao Bao
b41d074c9d
Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 am: f93a103587
...
am: 264caac23d
Change-Id: I497d29e2994f8865e4220811821b2441d6c6a63d
2017-07-27 17:48:18 +00:00
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
Tao Bao
ac3d1edca0
otautil: Clean up dirCreateHierarchy().
...
- Changed to std::string based implementation (mostly moved from the
former make_parents() in updater/install.cpp);
- Removed the timestamp parameter, which is only neeed by file-based OTA;
- Changed the type of mode from int to mode_t;
- Renamed dirCreateHierarchy() to mkdir_recursively().
Test: recovery_unit_test passes.
Test: No external user of dirCreateHierarchy() in code search.
Change-Id: I71f8c4b29bab625513bbc3af6d0d1ecdc3a2719a
2017-07-27 10:33:07 -07:00
Jin Qian
d674d35d0d
recovery: handle security footer before passing size to mke2fs am: 5e47d5161a -s ours
...
am: 3475faf5ea -s ours
Change-Id: I1421a0934fd72b0bdbfc2e35e34f37a64b096706
2017-07-26 00:31:23 +00:00
Jin Qian
ac05724573
recovery: handle security footer before passing size to mke2fs am: 5e47d5161a
...
am: e2d31361ef -s ours
Change-Id: I82c0f53a19c4c3b8311a432023a29fef93047a03
2017-07-25 23:44:28 +00:00
Jin Qian
e2d31361ef
recovery: handle security footer before passing size to mke2fs
...
am: 5e47d5161a
Change-Id: Iaf9b1b1138425101fa10946a215462ada4700433
2017-07-25 23:35:14 +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
09365a6ef7
recovery: Fix the flickering when turning on text mode.
...
am: fda6ee7d61
Change-Id: I5b12133b126a0a92cbff7e447d22b2cece5a28b4
2017-07-25 22:13:22 +00:00
Tao Bao
2affd4cac1
Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312
...
am: b0e8a507ac
Change-Id: I896d73cb352cce7844bf1b02a2f7e4f303fccb29
2017-07-25 22:09:23 +00: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
9d270b63ad
Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aa
...
am: 6e99b91fd0
Change-Id: Idee4f1765fc9569dcb479d3a558b52e712781488
2017-07-25 19:35:42 +00: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
Tao Bao
33d4ec78dc
Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d am: 28cf022931
...
am: ed4abe576b
Change-Id: I43e0a869b8971941469c31f922723b320bf8bcce
2017-07-25 19:20:10 +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