Tao Bao
63ae92ded4
Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e
...
am: 8269eb0d1f
Change-Id: I6d8211ab3825c34e8945a249fb2151a01a3ac371
2016-11-04 21:11:41 +00:00
Tao Bao
8269eb0d1f
Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df
...
am: 05a801ca8e
Change-Id: Ib6e162dd08ecb4f97a06beb54c26c5348a6782d1
2016-11-04 21:07:42 +00:00
Tao Bao
05a801ca8e
Merge "updater: Add a testcase for RenameFn()."
...
am: d0daf7f7df
Change-Id: I606b95f3d164063a271cd8faac8c5bfe42e2ef60
2016-11-04 21:04:12 +00:00
Tao Bao
d0daf7f7df
Merge "updater: Add a testcase for RenameFn()."
2016-11-04 21:01:11 +00:00
Tianjie Xu
7770c6f93e
Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67
...
am: 92097726ef
Change-Id: I714039a80d738392c6c1d967ae4e17c0fadce8bd
2016-11-04 18:21:01 +00:00
Tianjie Xu
92097726ef
Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658
...
am: 99adda9d67
Change-Id: I66a74981f5e7432aaa49ae74a38fc87e17acc02f
2016-11-04 18:17:31 +00:00
Tianjie Xu
99adda9d67
Merge "Cleanup the duplicates of logs rotation functions"
...
am: e2d05c5658
Change-Id: Ia63785d846ab05eca45ec1e548f7265d7feffdbb
2016-11-04 18:14:01 +00:00
Tianjie Xu
e2d05c5658
Merge "Cleanup the duplicates of logs rotation functions"
2016-11-04 18:07:08 +00:00
Tao Bao
afd1d3af5a
Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9
...
am: 786b083b8e
Change-Id: I835b4c749747b705cb78441b8e405b21a2198f56
2016-11-04 16:15:52 +00:00
Tao Bao
48745fbc41
Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac
...
am: b9c3411de7
Change-Id: I630bea739f6f5e49b57a007b69e0bfed5ca4a7ae
2016-11-04 16:15:25 +00:00
Tao Bao
786b083b8e
Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0
...
am: 4f91ca78b9
Change-Id: I00c70a6343e6cb8e62e27b4a0a3ee6da3934fc9c
2016-11-04 16:12:22 +00:00
Tao Bao
b9c3411de7
Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944
...
am: cb3cbaffac
Change-Id: I2536156317b0bcb4a272ce13db251af791bd67be
2016-11-04 16:11:56 +00:00
Tao Bao
4f91ca78b9
Merge "updater: Fix a bug in DeleteFn()."
...
am: 529032f4a0
Change-Id: I77054ec63705d4e8f72ce7232db5f394f7de420e
2016-11-04 16:08:55 +00:00
Tao Bao
cb3cbaffac
Merge "Revert "Revert "Some cleanups to recovery."""
...
am: a7a8262944
Change-Id: Iab6de4788c4dbecd33d076144f8324fde53b4024
2016-11-04 16:08:26 +00:00
Tao Bao
529032f4a0
Merge "updater: Fix a bug in DeleteFn()."
2016-11-04 16:04:58 +00:00
Tao Bao
a7a8262944
Merge "Revert "Revert "Some cleanups to recovery."""
2016-11-04 16:04:20 +00:00
Tao Bao
a659d79b92
updater: Add a testcase for RenameFn().
...
Test: recovery_component_test passes.
Change-Id: Iba5a0fdf6c79e2bed6b30b8fc19a306c1ab29d8a
2016-11-03 23:35:42 -07:00
Tao Bao
0831d0b592
updater: Fix a bug in DeleteFn().
...
Also add a testcase for delete() function.
Test: recovery_component_test passes.
Change-Id: I064d1ad4693c3ed339d0a69eabadd08a61a2ea86
2016-11-03 23:28:36 -07:00
Tao Bao
00c7b6112a
Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f
...
am: 4098285e8c
Change-Id: I0fa36336948867b75dc8226244ee25ba8e6987e0
2016-11-04 04:43:45 +00:00
Tao Bao
4098285e8c
Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0
...
am: 917be35f0f
Change-Id: I5b26c0bf7f7b156e91f66cffde0b64a5708b7eee
2016-11-04 04:39:44 +00:00
Tao Bao
917be35f0f
Merge "updater: Fix an off-by-1 bug in file_getprop()."
...
am: da2b34b5d0
Change-Id: Ib5d4f50a42465648bb6a5213f6676b11427b4278
2016-11-04 04:36:14 +00:00
Tao Bao
da2b34b5d0
Merge "updater: Fix an off-by-1 bug in file_getprop()."
2016-11-04 04:30:24 +00:00
Tianjie Xu
e113e4d67f
Cleanup the duplicates of logs rotation functions
...
Bug: 32067516
Test: Logs rotated successfully on angler, recovery-refresh/persist tests
passed on an a/b device.
Change-Id: Ie80adf0fa958ad3d7869d2d17f49489666b86c29
2016-11-03 18:16:33 -07:00
Tao Bao
51d516e913
updater: Fix an off-by-1 bug in file_getprop().
...
Also add a testcase for file_getprop().
Test: recovery_component_test passes.
Change-Id: I8eb2f9a5702b43997ac9f4b29665eea087b1c146
2016-11-03 14:58:54 -07:00
Tao Bao
ac9d94d19c
Revert "Revert "Some cleanups to recovery.""
...
This reverts commit 8584fcf677 .
This CL re-lands commit c0319b60f5 .
The "stage" and "reason" variables are now declared as global by
dropping the static qualifier, because they may be used by vendor
recovery libraries.
Test: lunch aosp_angler-userdebug; mmma bootable/recovery
Test: lunch aosp_dragon-userdebug; mmma bootable/recovery
Change-Id: I252c346f450079478cff22bbff01590b8ab2e2b3
2016-11-03 11:57:46 -07:00
Tao Bao
6ba75c1843
Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef
...
am: f35ce240a1
Change-Id: I7ba1d49da3c8078dd4e613ab6ba0f100d109d35f
2016-11-03 18:27:54 +00:00
Tao Bao
f35ce240a1
Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a
...
am: a98b4e4bef
Change-Id: I7d360dd0446fa055c8810bd0c989b79e4a1dbaee
2016-11-03 18:24:53 +00:00
Tao Bao
a98b4e4bef
Merge "tests: Set up testdata path for continuous native tests."
...
am: 4011bb161a
Change-Id: I9ca5ab5081cc1f08fe1caa0d0d9baac4f2447efb
2016-11-03 18:21:55 +00:00
Tao Bao
4011bb161a
Merge "tests: Set up testdata path for continuous native tests."
2016-11-03 18:15:07 +00:00
Tao Bao
4102b28132
tests: Set up testdata path for continuous native tests.
...
continuous_native_tests expects the testdata under DATA/ in
continuous_native_tests.zip. This CL packs a copy of the testdata into
continuous_native_tests.zip as DATA/nativetest/recovery/testdata (via
LOCAL_PICKUP_FILES).
This CL also removes the extra copy for nativetest64. Testdata will
always stay at /data/nativetest/recovery/testdata, even for 64-bit
version. Otherwise we will unnecessarily get four copies (two for data/
and another two for DATA/).
Bug: 32123241
Test: mmma bootable/recovery && adb sync data. On bullhead,
/data/nativetest/recovery_component_test/recovery_component_test works;
/data/nativetest64/recovery_component_test/recovery_component_test works.
Test: m continuous_native_test; DATA/nativetest/recovery/testdata exists.
Change-Id: Ifefa0309de7af23c77654e8e450848ca2da218c2
2016-11-02 23:18:01 -07:00
Tao Bao
8172cddc82
Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac
...
am: 24356d778f
Change-Id: I6d95162b39478f0ea90676bf3635e2afa0b1536e
2016-11-02 17:30:03 +00:00
Tao Bao
24356d778f
Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4
...
am: 4fc42365ac
Change-Id: I11edb4c0a9299c9824c1e82c7f996ec32be7a0c9
2016-11-02 17:27:33 +00:00
Tao Bao
4fc42365ac
Merge "applypatch: Add testcases for applypatch executable."
...
am: 5696526ba4
Change-Id: I923ed0311335a798965cd83f0ba070223a0963b2
2016-11-02 17:22:01 +00:00
Treehugger Robot
5696526ba4
Merge "applypatch: Add testcases for applypatch executable."
2016-11-02 17:19:45 +00:00
Tianjie Xu
c81ef65828
Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54
...
am: 0b6085a341
Change-Id: I9b76ca015f94677775cc8dd75b755dd4b226183d
2016-11-02 00:06:35 +00:00
Tianjie Xu
0b6085a341
Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c
...
am: 88fc75ee54
Change-Id: Ie167a4fef7f877c0cb40715aa3bbb95a08e9926d
2016-11-02 00:03:36 +00:00
Tianjie Xu
88fc75ee54
Merge "Cleanup ReadArgs & ReadValueArgs usage"
...
am: a9b252887c
Change-Id: I2bf575fbb14165e7904d01b01b71ec6e3f24f068
2016-11-02 00:01:05 +00:00
Tianjie Xu
a9b252887c
Merge "Cleanup ReadArgs & ReadValueArgs usage"
2016-11-01 23:53:02 +00:00
Tianjie Xu
5fe280ac96
Cleanup ReadArgs & ReadValueArgs usage
...
ReadArgs will switch to using std::string and std::unique_ptr. Also
cleanup the callers.
Test: mma & component test passed.
Change-Id: I4724406ae6c0c134a27bbd1cdd24ad5d343b2a3b
2016-11-01 15:03:06 -07:00
Tao Bao
36c3511952
applypatch: Add testcases for applypatch executable.
...
Refactor applypatch/main.cpp into libapplypatch_modes so that we can add
testcases.
Some changes to applypatch/main.cpp:
- Replace char** argv with const char**;
- Use android::base::Split() to split ":";
- Use android::base::ParseUInt().
Bug: 32383590
Test: Unit tests pass, install-recovery.sh works.
Change-Id: I44e7bfa5ab717d439ea1d0ee9ddb7b2c40bb95a4
2016-11-01 14:40:14 -07:00
Tao Bao
492bd8ca71
Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0
...
am: edf2928edf
Change-Id: I475d65b39824734260cad5921f02a6eaad80bd4b
2016-11-01 21:35:20 +00:00
Tao Bao
edf2928edf
Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef
...
am: bc48de6bf0
Change-Id: Ibb887acf4d2afe46fbbe1193daddcf73eff3423e
2016-11-01 21:32:50 +00:00
Tao Bao
bc48de6bf0
Merge "applypatch: Switch the parameter of Value** to std::vector."
...
am: 3f4030e0ef
Change-Id: I741638c51e9c3fe57cc874e6af86ea6a65d5aa71
2016-11-01 21:30:20 +00:00
Tao Bao
3f4030e0ef
Merge "applypatch: Switch the parameter of Value** to std::vector."
2016-11-01 21:25:12 +00:00
Tao Bao
fada91ccf2
applypatch: Switch the parameter of Value** to std::vector.
...
Test: Unit tests and install-recovery.sh pass on angler and dragon.
Change-Id: I328e6554edca667cf850f5584ebf1ac211e3d4d1
2016-10-28 16:46:12 -07:00
Andriy Naborskyy
8b1840799e
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours
...
am: 9ab6af5a61 -s ours
Change-Id: Ib10f137a0f23752ebc1d0090f9b90ba22504703b
2016-10-27 16:30:56 +00:00
Andriy Naborskyy
9ab6af5a61
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours
...
am: 67bc0b9573 -s ours
Change-Id: Id648e49a1e81d7cc22a273fbd209c18ffe1ea0b0
2016-10-27 16:25:56 +00:00
Andriy Naborskyy
67bc0b9573
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours
...
am: 3fdf1fd515 -s ours
Change-Id: I8cfd3782a8cac351057b258d44caaa987397201d
2016-10-27 16:21:56 +00:00
Andriy Naborskyy
3fdf1fd515
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours
...
am: 8837b0d25d -s ours
Change-Id: I7ecada4bf93f79a8b308064c417e85d4e7f9ecc3
2016-10-27 16:16:55 +00:00
Andriy Naborskyy
8837b0d25d
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours
...
am: b8c1788e7b -s ours
Change-Id: I14de8cfdef94dfcb2d3f0760daf519537fa796d5
2016-10-27 16:11:55 +00:00