Tianjie Xu and android-build-merger
1409bf79e3
Merge "Save the target file when applypatch tests fail" am: 957c1abfba am: 7ad3e673ba
...
am: 52635f5259
Change-Id: I5e22c99622aa30a9764837543beaa80ee03de017
2018-04-27 10:04:03 -07:00
Tianjie Xu and android-build-merger
52635f5259
Merge "Save the target file when applypatch tests fail" am: 957c1abfba
...
am: 7ad3e673ba
Change-Id: Ic3786f79e280ada93c19201f19e55aa2b67c14ad
2018-04-27 09:58:19 -07:00
Tianjie Xu and android-build-merger
7ad3e673ba
Merge "Save the target file when applypatch tests fail"
...
am: 957c1abfba
Change-Id: I100dd5ba4fb2c3bd4a29bd8759dcd65f03afbe50
2018-04-27 09:53:47 -07:00
Tianjie Xu and Gerrit Code Review
957c1abfba
Merge "Save the target file when applypatch tests fail"
2018-04-27 16:45:25 +00:00
Zhomart Mukhamejanov and android-build-merger
1ad0f9962a
Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c am: 811baa37d3
...
am: d4270924f0
Change-Id: Ied155294e637694148428b1926d28b37929d41e0
2018-04-26 22:12:01 -07:00
Zhomart Mukhamejanov and android-build-merger
d4270924f0
Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c
...
am: 811baa37d3
Change-Id: Ib27fa8dbb7679ee0762923d1449ddded88403333
2018-04-26 21:53:28 -07:00
Zhomart Mukhamejanov and android-build-merger
811baa37d3
Merge "updater_sample: fix gen_update_config.py"
...
am: 2573b6fa1c
Change-Id: I4e21d34a1cfe6181e0db3d49296db54e21b70805
2018-04-26 21:47:25 -07:00
android-build-prod (mdb) and android-build-merger
aef49d5344
[automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964 am: b73e921a27 -s ours
...
am: 91dd4feefc -s ours
Change-Id: Ia5b588a2b660078d155df7e28d0b2fad958d8267
2018-04-26 21:28:27 -07:00
Zhomart Mukhamejanov and Gerrit Code Review
2573b6fa1c
Merge "updater_sample: fix gen_update_config.py"
2018-04-27 04:25:23 +00:00
android-build-prod (mdb) and android-build-merger
91dd4feefc
[automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964
...
am: b73e921a27 -s ours
Change-Id: I2f2b7830adb57bb638bd6058177132f2d860889a
2018-04-26 21:22:02 -07:00
android-build-prod (mdb) and android-build-merger
b73e921a27
Merge "recovery: Print the actually required battery level."
...
am: ca456f3964
Change-Id: I2d417474c3e37add42cd7a9f1055402f5c1b8a26
2018-04-26 21:15:21 -07:00
android-build-prod (mdb) and Gerrit Code Review
ca456f3964
Merge "recovery: Print the actually required battery level."
2018-04-27 04:03:13 +00:00
Tao Bao and android-build-merger
76f30864d5
Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp
...
am: 96156d1f31
Change-Id: I54594a1d098362a3809933e263066824595572cb
2018-04-26 20:20:09 -07:00
Tao Bao and Android (Google) Code Review
96156d1f31
Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp
2018-04-27 03:14:55 +00:00
Tianjie Xu
3f638ee834
Save the target file when applypatch tests fail
...
Save the target file to tempfile upon unittest failures so that we can
try to decompress the deflate chunks in the flaky unittests. And print
the zlib version in case that gets changed.
Also the SHA1 of the uncompressed data seems correct; so only keep the
final SHA1 to double confirm.
Bug: 67849209
Test: recovery_component_test
Change-Id: Ic6447c2b75c29379d6844cd23a0ff1c4305694a0
2018-04-26 19:46:39 -07:00
Zhomart Mukhamejanov
72a4d465bf
updater_sample: fix gen_update_config.py
...
Fix gen_update_config.py.
And add tests for gen_update_config.py.
Test: python3 updater_sample/tools/gen_update_config_test.py
Change-Id: I0d270f1d5d7635855ee9acb0dd094e083cd33e3a
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-04-26 19:40:48 -07:00
Tao Bao and android-build-merger
af10186982
[automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d am: a742fb0994 -s ours
...
am: 63503282a1 -s ours
Change-Id: If7eddee892d3d2965d64560c755cea314db37fdd
2018-04-26 15:45:58 -07:00
Tao Bao and android-build-merger
6a090515bb
Merge "Mark ui_print with __printflike." into pi-dev-plus-aosp
...
am: 3eb0a4705f
Change-Id: I5b3c94e86068ed6ef38f2e7797bc75d73ba29483
2018-04-26 15:43:15 -07:00
Tao Bao and android-build-merger
63503282a1
[automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d
...
am: a742fb0994 -s ours
Change-Id: I3f1a53e1c20e2a43fa42a104263bd528219a69b7
2018-04-26 15:37:34 -07:00
Tao Bao and Android (Google) Code Review
3eb0a4705f
Merge "Mark ui_print with __printflike." into pi-dev-plus-aosp
2018-04-26 22:36:20 +00:00
Tao Bao
6d90a9d4a0
recovery: Print the actually required battery level.
...
It should be one of BATTERY_OK_PERCENTAGE (20) and
BATTERY_WITH_CHARGER_OK_PERCENTAGE (15), depending on the charger state.
Also move the battery level related constants next to their users.
Test: mmma -j bootable/recovery
Test: Build and boot into recovery with a pending OTA. Check the log.
Change-Id: I7513f59c4718ec8e2db16c5266928470c2308648
(cherry picked from commit f2ea6d7999 )
2018-04-26 15:30:14 -07:00
Tao Bao and android-build-merger
a742fb0994
Merge "Mark ui_print with __printflike."
...
am: 220b531e3d
Change-Id: Ia13734618844f2ca82f83da897823183d8c9e443
2018-04-26 15:26:25 -07:00
Tao Bao
f2ea6d7999
recovery: Print the actually required battery level.
...
It should be one of BATTERY_OK_PERCENTAGE (20) and
BATTERY_WITH_CHARGER_OK_PERCENTAGE (15), depending on the charger state.
Also move the battery level related constants next to their users.
Test: mmma -j bootable/recovery
Test: Build and boot into recovery with a pending OTA. Check the log.
Change-Id: I7513f59c4718ec8e2db16c5266928470c2308648
Merged-In: I7513f59c4718ec8e2db16c5266928470c2308648
2018-04-26 15:21:34 -07:00
Tao Bao and Gerrit Code Review
220b531e3d
Merge "Mark ui_print with __printflike."
2018-04-26 22:18:17 +00:00
Tao Bao
aae7efd7a2
Mark ui_print with __printflike.
...
And fix an issue as a result of the change.
Test: mmma -j bootable/recovery
Change-Id: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
Merged-In: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
2018-04-26 13:42:42 -07:00
TreeHugger Robot and Android (Google) Code Review
3d655c0ab8
Merge "Mark ui_print with __printflike."
2018-04-26 20:27:50 +00:00
Zhomart Mukhamejanov and android-build-merger
611de8ca19
Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9 am: 9882160d8d
...
am: b83de268c6
Change-Id: I63023456d15a4e4adb25dbcf056a497df4854f4b
2018-04-26 12:52:06 -07:00
Zhomart Mukhamejanov and android-build-merger
c1eeb47ce9
Merge "sample_updater: add tests resources" am: 7d064166ce am: 6131d00348
...
am: f3cb640f1b
Change-Id: I504ed72c8ba3c96e87355fe1d1be667d0033442c
2018-04-26 12:51:27 -07:00
Zhomart Mukhamejanov and android-build-merger
b83de268c6
Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9
...
am: 9882160d8d
Change-Id: I79b31a904c2c60e33272e532d061da896c769e96
2018-04-26 12:45:55 -07:00
Zhomart Mukhamejanov and android-build-merger
f3cb640f1b
Merge "sample_updater: add tests resources" am: 7d064166ce
...
am: 6131d00348
Change-Id: Ice6103cd297e321a4d3d51b7c6c091aa1906b005
2018-04-26 12:45:23 -07:00
Zhomart Mukhamejanov and android-build-merger
9882160d8d
Merge "sample_updater: create tools/gen_update_config.py"
...
am: 6bd1d9b8d9
Change-Id: I40f5c3650517bcdc20194fbc7abf0cadaccd9d4f
2018-04-26 12:36:04 -07:00
Zhomart Mukhamejanov and android-build-merger
6131d00348
Merge "sample_updater: add tests resources"
...
am: 7d064166ce
Change-Id: I96ecdfef2f05798c4f072ee21718dbb4c0c640f2
2018-04-26 12:35:44 -07:00
Tao Bao
370d600877
Mark ui_print with __printflike.
...
And fix an issue as a result of the change.
Test: mmma -j bootable/recovery
Change-Id: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
(cherry picked from commit 8af89c3a02c1bf358fc3c3b4e0a7cedc8f48631e)
2018-04-26 19:23:04 +00:00
Zhomart Mukhamejanov and Gerrit Code Review
6bd1d9b8d9
Merge "sample_updater: create tools/gen_update_config.py"
2018-04-26 19:21:08 +00:00
Zhomart Mukhamejanov and Gerrit Code Review
7d064166ce
Merge "sample_updater: add tests resources"
2018-04-26 19:20:56 +00:00
Tao Bao
6ec9ddddda
Mark ui_print with __printflike.
...
And fix an issue as a result of the change.
Test: mmma -j bootable/recovery
Change-Id: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
(cherry picked from commit 8af89c3a02c1bf358fc3c3b4e0a7cedc8f48631e)
2018-04-26 18:05:12 +00:00
Tianjie Xu and android-build-merger
5b5d111b70
Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508 am: 247821648f
...
am: 0aa1a3b941
Change-Id: Ic205697ae378bc548b3a43f2f1e4bfcc2c05fce3
2018-04-26 10:47:42 -07:00
Tianjie Xu and android-build-merger
0aa1a3b941
Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508
...
am: 247821648f
Change-Id: Id7b098becfc35b4c94213582f274e3c08c19583b
2018-04-26 10:41:39 -07:00
Tianjie Xu and android-build-merger
247821648f
Merge "Dump the uncompressed data's SHA1 to debug flaky tests"
...
am: cc8587b508
Change-Id: Iaca05198698844f1058e625647e545e55ae47ab8
2018-04-26 10:36:43 -07:00
Tianjie Xu and Gerrit Code Review
cc8587b508
Merge "Dump the uncompressed data's SHA1 to debug flaky tests"
2018-04-26 17:23:00 +00:00
android-build-prod (mdb) and android-build-merger
caa9e09265
Merge "Rename CacheLocation to Paths." am: 49c7f1cec3 am: ce562bacfd
...
am: 7acf21c34a
Change-Id: Ifb9a8a76d7c4165ade02c308299b3786d36f345a
2018-04-26 09:48:27 -07:00
android-build-prod (mdb) and android-build-merger
7acf21c34a
Merge "Rename CacheLocation to Paths." am: 49c7f1cec3
...
am: ce562bacfd
Change-Id: I5b084052f3f84a6e58e1267e58a125a7ed47080e
2018-04-26 09:43:25 -07:00
android-build-prod (mdb) and android-build-merger
ce562bacfd
Merge "Rename CacheLocation to Paths."
...
am: 49c7f1cec3
Change-Id: I335f1df6699d8316d41959c21a09cbf944d7554b
2018-04-26 09:38:23 -07:00
android-build-prod (mdb) and Gerrit Code Review
49c7f1cec3
Merge "Rename CacheLocation to Paths."
2018-04-26 16:24:41 +00:00
Tao Bao
641fa97def
Rename CacheLocation to Paths.
...
We have a general need for overriding more paths (e.g. "/tmp"), mostly
for testing purpose. Rename CacheLocation to Paths, and use that to
manage TEMPORARY_{INSTALL,LOG}_FILE.
Test: mmma -j bootable/recovery
Test: recovery_component_test
Change-Id: Ia8ce8e5695df37ca434f13ac4d3206de1e8e9396
2018-04-25 21:46:00 -07:00
Tianjie Xu
9e1ccd47b4
Dump the uncompressed data's SHA1 to debug flaky tests
...
Dump the SHA1 of the uncompressed data in applypatch to confirm if we
are at least doing the bspatch part correctly. (I expect so since the actual
length of the uncompressed data matches the expected length).
Also try to decompress the deflate chunk inside the recovery image for
these two flacky tests. In theory, there shouldn't be randomness in
zlib; so we would know if we process the data wrongly if the deflate fails
to decompress.
Bug: 67849209
Test: recovery_component_test
Change-Id: Id947522153b1eeb0d10d161298a96fb045f92018
2018-04-25 20:00:56 -07:00
Zhomart Mukhamejanov
02e912c235
sample_updater: add tests resources
...
This resource files are used in tests. ota package zip file
contains only text files.
Config files are generated using tools/gen_update_config.py
Test: N/A
Change-Id: I9d3d0f81472dc20db18b32f4a9445a998b68b0e3
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-04-25 18:18:46 -07:00
Zhomart Mukhamejanov and android-build-merger
307318018d
Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4 am: 23d17302b1
...
am: e7248bef4e
Change-Id: I8566e16549d7057fa6ffaade8c31b3591512e99d
2018-04-25 18:11:16 -07:00
Zhomart Mukhamejanov and android-build-merger
e7248bef4e
Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4
...
am: 23d17302b1
Change-Id: Ic155ecfd3dab5ba2738b87a68be06a19c9abda26
2018-04-25 17:57:03 -07:00
Zhomart Mukhamejanov and android-build-merger
23d17302b1
Merge "updater_sample: Use stubs libs for android.test.base / runner."
...
am: d97b643de4
Change-Id: I65d85eea826232633919a2c91a66b80a1c37e6c6
2018-04-25 17:52:00 -07:00