9e13f18e76
Merge "Fix updater include generation w/installclean" am: 6d0262218a am: c1cb30f842
...
am: 8a77b9d831
2017-03-22 01:35:47 +00:00
8a77b9d831
Merge "Fix updater include generation w/installclean" am: 6d0262218a
...
am: c1cb30f842
2017-03-22 01:33:47 +00:00
c1cb30f842
Merge "Fix updater include generation w/installclean"
...
am: 6d0262218a
2017-03-22 01:31:47 +00:00
6d0262218a
Merge "Fix updater include generation w/installclean"
2017-03-22 01:28:04 +00:00
edec27a5bd
Fix updater include generation w/installclean
...
Since this was putting the intermediate file in obj/PACKAGING, every
installclean was removing it and triggering updater to rebuild. Instead,
use the standard generated-sources-dir. The dep file can also be removed
now that ninja will re-run the generator if the command line changes.
Test: m -j updater; m installclean; m -j updater
Test: Only change to aosp_fugu updater before/after is the debug info
Change-Id: I20928bd2049d4a3d4e21f83fd64d16cfdc541958
2017-03-21 16:46:24 -07:00
9d9f310f4e
Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 am: 43bd2c8414
...
am: 1c456cd3a5
2017-03-21 19:16:39 +00:00
1c456cd3a5
Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13
...
am: 43bd2c8414
2017-03-21 19:13:07 +00:00
43bd2c8414
Merge "verify_file: Add constness to a few addresses."
...
am: 5b2bf90e13
2017-03-21 19:09:37 +00:00
5b2bf90e13
Merge "verify_file: Add constness to a few addresses."
2017-03-21 19:01:23 +00:00
76fdb2419b
verify_file: Add constness to a few addresses.
...
We should not touch any data while verifying packages (or parsing the
in-memory ASN.1 structures).
Test: mmma bootable/recovery
Test: recovery_component_test passes.
Test: recovery_unit_test passes.
Change-Id: Ie990662c6451ec066a1807b3081c9296afbdb0bf
2017-03-20 22:13:56 -07:00
e44af82043
Merge "Add testcases for load_keys()." am: 110102f37e am: 43f5ad6e90
...
am: 60ea643afb
2017-03-20 19:36:05 +00:00
60ea643afb
Merge "Add testcases for load_keys()." am: 110102f37e
...
am: 43f5ad6e90
2017-03-20 19:32:05 +00:00
43f5ad6e90
Merge "Add testcases for load_keys()."
...
am: 110102f37e
2017-03-20 19:28:05 +00:00
110102f37e
Merge "Add testcases for load_keys()."
2017-03-20 19:24:23 +00:00
b7d07f7b1e
Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 am: b2617e882e
...
am: cc3f3c3d1c
2017-03-20 16:32:24 +00:00
cc3f3c3d1c
Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9
...
am: b2617e882e
2017-03-20 16:28:24 +00:00
b2617e882e
Merge "Remove the dead #include's in verifier.cpp."
...
am: 64d25024b9
2017-03-20 16:24:23 +00:00
64d25024b9
Merge "Remove the dead #include's in verifier.cpp."
2017-03-20 16:20:46 +00:00
3116ce4651
Add testcases for load_keys().
...
Test: recovery_component_test passes.
Change-Id: I6276b59981c87c50736d69d4af7647c8ed892965
2017-03-18 14:16:21 -07:00
d7bf82eb53
Remove the dead #include's in verifier.cpp.
...
A follow-up to commit 5e535014dd
2017-03-18 09:28:42 -07:00
b6d60d69c5
resolve merge conflicts of 90d3f20c to stage-aosp-master am: 553c7bd307
...
am: f3db68dd61
2017-03-18 15:55:55 +00:00
f3db68dd61
resolve merge conflicts of 90d3f20c to stage-aosp-master
...
am: 553c7bd307
2017-03-18 15:33:23 +00:00
553c7bd307
resolve merge conflicts of 90d3f20c to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c1806eceb56712c4b3d1c67d54f4b21bd3fe50a
2017-03-18 07:33:26 -07:00
90d3f20c99
Merge "Drop the dependency on 'ui' in verify_file()."
2017-03-18 14:16:16 +00:00
2b83f36355
Merge "Drop the dependency on 'ui' in verify_file()."
2017-03-17 23:41:45 +00:00
7b22c92ac1
Drop the dependency on 'ui' in verify_file().
...
verify_file() has a dependency on the global variable of 'ui' for
posting the verification progress, which requires the users of
libverifier to provide a UI instance.
This CL adds an optional argument to verify_file() so that it can
post the progress through the provided callback function. As a result,
we can drop the MockUI class in verifier_test.cpp.
Test: recovery_component_test passes.
Test: verify_file() posts progress update when installing an OTA.
Change-Id: I8b87d0f0d99777ea755d33d6dbbe2b6d44243bf1
(cherry picked from commit 5e535014dd
2017-03-17 14:14:07 -07:00
5e535014dd
Drop the dependency on 'ui' in verify_file().
...
verify_file() has a dependency on the global variable of 'ui' for
posting the verification progress, which requires the users of
libverifier to provide a UI instance.
This CL adds an optional argument to verify_file() so that it can
post the progress through the provided callback function. As a result,
we can drop the MockUI class in verifier_test.cpp.
Test: recovery_component_test passes.
Test: verify_file() posts progress update when installing an OTA.
Change-Id: I8b87d0f0d99777ea755d33d6dbbe2b6d44243bf1
2017-03-17 14:07:12 -07:00
b3871a5d7b
Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c am: 9accc96dd1
...
am: 592078f554
2017-03-17 19:20:35 +00:00
592078f554
Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c
...
am: 9accc96dd1
2017-03-17 19:17:04 +00:00
9accc96dd1
Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks"""
...
am: 73cb75b46c
2017-03-17 19:13:35 +00:00
73cb75b46c
Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks"""
2017-03-17 19:06:38 +00:00
c76805952e
Merge "Add a test to perform block_image_update" am: 881b08ecd2 am: 5c06706d51
...
am: 640fc1d338
2017-03-17 18:34:31 +00:00
640fc1d338
Merge "Add a test to perform block_image_update" am: 881b08ecd2
...
am: 5c06706d51
2017-03-17 18:31:00 +00:00
5c06706d51
Merge "Add a test to perform block_image_update"
...
am: 881b08ecd2
2017-03-17 18:28:30 +00:00
881b08ecd2
Merge "Add a test to perform block_image_update"
2017-03-17 18:22:11 +00:00
edc96fdc44
Merge "Add the missing #include of <functional>." am: dd553d280f am: 965021ab8d
...
am: 26d00e87f9
2017-03-17 15:55:49 +00:00
26d00e87f9
Merge "Add the missing #include of <functional>." am: dd553d280f
...
am: 965021ab8d
2017-03-17 15:49:18 +00:00
965021ab8d
Merge "Add the missing #include of <functional>."
...
am: dd553d280f
2017-03-17 15:43:17 +00:00
dd553d280f
Merge "Add the missing #include of <functional>."
2017-03-17 15:35:54 +00:00
9468fc0429
Add the missing #include of <functional>.
...
For the use of std::function and std::bind. They were relying on the
transitive inclusion from <minui/minui.h>.
Test: mmma bootable/recovery
Change-Id: Ia138e1cbdd035b11d6cdca9e16c5591303b6ee13
2017-03-17 01:00:25 -07:00
2cd36ba522
Revert "Revert "Print SHA-1 in hex for corrupted blocks""
...
This reverts commit 90eff6a340
2017-03-16 23:33:01 -07:00
56ebe620a2
Add a test to perform block_image_update
...
Add the following tests:
stash src
bspatch stashed_src tgt
free stashed_src
(expected a successful update)
stash src
free stashed_src
fail_the_update
(expected stashed_src freed)
Bug: 36242722
Test: Test identified unfreed stashes correctly.
Change-Id: I5a136e8dc31774367972fbfe8c63cbc1ddb3a113
2017-03-16 23:06:37 -07:00
92d167513d
Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 am: 91f8574061
...
am: dda128abbf
2017-03-17 01:06:49 +00:00
dda128abbf
Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5
...
am: 91f8574061
2017-03-17 01:03:49 +00:00
91f8574061
Merge "More cleanup to imgdiff & imgpatch"
...
am: 3541934ff5
2017-03-17 01:00:20 +00:00
3541934ff5
Merge "More cleanup to imgdiff & imgpatch"
2017-03-17 00:52:50 +00:00
b1fc62065b
Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612 am: 8209daeff1
...
am: 8da15d10da
2017-03-16 23:29:12 +00:00
8da15d10da
Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612
...
am: 8209daeff1
2017-03-16 23:26:42 +00:00
8209daeff1
Merge "updater: Minor clean up to EnumerateStash()."
...
am: 4fc7659612
2017-03-16 23:24:12 +00:00
4fc7659612
Merge "updater: Minor clean up to EnumerateStash()."
2017-03-16 23:15:06 +00:00
Dan Willemsen
Treehugger Robot
Tao Bao
Tianjie Xu