5faa5523cb
Merge "updater_sample: Improve UpdateConfig" am: af5958818a am: 0b54d77832
...
am: 58520947e5
2018-05-01 12:24:36 -07:00
58520947e5
Merge "updater_sample: Improve UpdateConfig" am: af5958818a
...
am: 0b54d77832
2018-05-01 12:14:33 -07:00
0b54d77832
Merge "updater_sample: Improve UpdateConfig"
...
am: af5958818a
2018-05-01 12:10:32 -07:00
af5958818a
Merge "updater_sample: Improve UpdateConfig"
2018-05-01 19:05:22 +00:00
9a28560ec6
[automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 am: 17f6c1b041 -s ours
...
am: 9fa43507ef
2018-05-01 11:19:10 -07:00
9fa43507ef
[automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073
...
am: 17f6c1b041
2018-05-01 11:09:47 -07:00
17f6c1b041
Merge "recovery: Split main() into recovery_main.cpp."
...
am: 0204e88073
2018-05-01 11:04:46 -07:00
0204e88073
Merge "recovery: Split main() into recovery_main.cpp."
2018-05-01 17:54:40 +00:00
963e3eeb00
updater_sample: Improve UpdateConfig
...
UpdateConfig:
- constant names changed
- added parsing streaming metadata
- added InnerFile to describe a file in zip
Android.mk
- added guava
tests fixed
Test: using junit4
Change-Id: Ibe3c8a3bde20259b0eea9a79aca4b22ed7b048f4
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-01 10:24:57 -07:00
6d99d4b457
recovery: Split main() into recovery_main.cpp.
...
This prepares for moving more codes from recovery into librecovery, so
that they will become more easily testable. recovery_main.cpp will be
the source code for recovery module, with the rest moved into
librecovery. recovery_main.cpp mainly does the initializations, such as
setting up the logger.
Test: mmma -j bootable/recovery
Test: recovery_component_test
Test: Build and boot into recovery image on marlin.
Change-Id: I8e846524546b6f3f0e32ed869e851f62261eef23
Merged-In: I8e846524546b6f3f0e32ed869e851f62261eef23
2018-05-01 09:48:00 -07:00
97d757fbfc
recovery: Split main() into recovery_main.cpp.
...
am: 2ac56afc7b
2018-05-01 08:57:06 -07:00
2ac56afc7b
recovery: Split main() into recovery_main.cpp.
...
This prepares for moving more codes from recovery into librecovery, so
that they will become more easily testable. recovery_main.cpp will be
the source code for recovery module, with the rest moved into
librecovery. recovery_main.cpp mainly does the initializations, such as
setting up the logger.
Test: mmma -j bootable/recovery
Test: recovery_component_test
Test: Build and boot into recovery image on marlin.
Change-Id: I8e846524546b6f3f0e32ed869e851f62261eef23
(cherry picked from commit c241cb662440551eb0d2f42345f7ee08cf60a7dd)
2018-04-30 21:04:55 -07:00
7ffa008463
Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142 am: 7e61191258
...
am: 39caabc7e3
2018-04-30 19:41:10 -07:00
39caabc7e3
Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142
...
am: 7e61191258
2018-04-30 19:09:47 -07:00
7e61191258
Merge "Drop '#include "ui.h"' from device.h."
...
am: 2de12da142
2018-04-30 19:04:03 -07:00
2de12da142
Merge "Drop '#include "ui.h"' from device.h."
2018-05-01 01:54:45 +00:00
c16fd8a931
Drop '#include "ui.h"' from device.h.
...
We don't need the dependency in the header.
Test: mmma -j bootable/recovery
Change-Id: I03741ae7911a7e8bf1284b2821cf986ca0ab434e
2018-04-30 17:15:17 -07:00
372abb6c5e
Merge changes I78839ed4,I75ac0e26 am: e4d65b681a am: 040674586b
...
am: c3674ab1b2
2018-04-30 13:05:24 -07:00
c3674ab1b2
Merge changes I78839ed4,I75ac0e26 am: e4d65b681a
...
am: 040674586b
2018-04-30 12:58:47 -07:00
040674586b
Merge changes I78839ed4,I75ac0e26
...
am: e4d65b681a
2018-04-30 12:53:55 -07:00
e4d65b681a
Merge changes I78839ed4,I75ac0e26
...
* changes:
recovery: Move a few constants closer to their uses.
recovery: Fix the return value when failing to convert to FBE.
2018-04-30 19:39:42 +00:00
aac9d9fcf8
recovery: Move a few constants closer to their uses.
...
Test: mmma -j bootable/recovery
Change-Id: I78839ed487ef41b4eaa3787cb7b4bf33fb0d164a
2018-04-30 10:57:36 -07:00
406a6ff5e6
recovery: Fix the return value when failing to convert to FBE.
...
Test: Build and flash aosp_angler-userdebug. Choose 'Convert to file
encryption' from Developer Options. Converting to FBE still works.
Change-Id: I75ac0e266af2d00bfaff0664f8bcee74a5f16b41
2018-04-30 10:55:59 -07:00
af01117405
Merge "Merge libmounts into libotautil." am: 686353215f am: cddf5dbf67
...
am: 1c1737b660
2018-04-28 09:59:22 -07:00
1c1737b660
Merge "Merge libmounts into libotautil." am: 686353215f
...
am: cddf5dbf67
2018-04-28 09:55:49 -07:00
cddf5dbf67
Merge "Merge libmounts into libotautil."
...
am: 686353215f
2018-04-28 09:52:14 -07:00
686353215f
Merge "Merge libmounts into libotautil."
2018-04-28 16:46:19 +00:00
9a319f01f8
Merge libmounts into libotautil.
...
Export its header (mounts.h) from there, and drop the dot dot dependency
from libupdater / updater.
Test: mmma bootable/recovery
Test: recovery_component_test
Change-Id: Ic26a6b9b78a34dbe1f178b138f3abaafffbec44c
2018-04-27 21:13:57 -07:00
77850f36d4
Merge "recovery: Revoke (most of) short options." am: 3de3756081 am: 29c9690864
...
am: 5d096631ac
2018-04-27 16:24:33 -07:00
5d096631ac
Merge "recovery: Revoke (most of) short options." am: 3de3756081
...
am: 29c9690864
2018-04-27 16:20:02 -07:00
29c9690864
Merge "recovery: Revoke (most of) short options."
...
am: 3de3756081
2018-04-27 16:15:44 -07:00
3de3756081
Merge "recovery: Revoke (most of) short options."
2018-04-27 23:09:31 +00:00
f9f17347c8
recovery: Revoke (most of) short options.
...
`recovery` is not a command line tool, and these short options don't
have the common meanings that are used elsewhere.
In the platform code, we're not actively using the short forms.
- bootable/recovery/uncrypt/uncrypt.cpp
- bootable/recovery/updater/install.cpp
- frameworks/base/core/java/android/os/RecoverySystem.java
- system/core/adb/services.cpp
- system/core/init/builtins.cpp
- system/update_engine/hardware_android.cc
- system/vold/cryptfs.cpp
(Callers must have used libbootloader_message.)
'--show_text' and '--just_exit' are not that obvious from the initial
commit messages. They appear to be used by vendor code (e.g.
'--show_text' is optionally used by bootloader, as in the noted bug). So
this CL keeps them as is for now.
Test: `mmma -j bootable/recovery`
Test: Check the code search for possible callers to recovery.
Change-Id: I8a87f5fb50131d647dfc8290381ca47a60f543fa
2018-04-27 12:34:14 -07:00
1409bf79e3
Merge "Save the target file when applypatch tests fail" am: 957c1abfba am: 7ad3e673ba
...
am: 52635f5259
2018-04-27 10:04:03 -07:00
52635f5259
Merge "Save the target file when applypatch tests fail" am: 957c1abfba
...
am: 7ad3e673ba
2018-04-27 09:58:19 -07:00
7ad3e673ba
Merge "Save the target file when applypatch tests fail"
...
am: 957c1abfba
2018-04-27 09:53:47 -07:00
957c1abfba
Merge "Save the target file when applypatch tests fail"
2018-04-27 16:45:25 +00:00
1ad0f9962a
Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c am: 811baa37d3
...
am: d4270924f0
2018-04-26 22:12:01 -07:00
d4270924f0
Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c
...
am: 811baa37d3
2018-04-26 21:53:28 -07:00
811baa37d3
Merge "updater_sample: fix gen_update_config.py"
...
am: 2573b6fa1c
2018-04-26 21:47:25 -07:00
aef49d5344
[automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964 am: b73e921a27 -s ours
...
am: 91dd4feefc
2018-04-26 21:28:27 -07:00
2573b6fa1c
Merge "updater_sample: fix gen_update_config.py"
2018-04-27 04:25:23 +00:00
91dd4feefc
[automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964
...
am: b73e921a27
2018-04-26 21:22:02 -07:00
b73e921a27
Merge "recovery: Print the actually required battery level."
...
am: ca456f3964
2018-04-26 21:15:21 -07:00
ca456f3964
Merge "recovery: Print the actually required battery level."
2018-04-27 04:03:13 +00:00
76f30864d5
Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp
...
am: 96156d1f31
2018-04-26 20:20:09 -07:00
96156d1f31
Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp
2018-04-27 03:14:55 +00:00
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
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
af10186982
[automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d am: a742fb0994 -s ours
...
am: 63503282a1
2018-04-26 15:45:58 -07:00
Zhomart Mukhamejanov
Tao Bao
android-build-prod (mdb)
Tianjie Xu