Commit Graph

1932 Commits

Author SHA1 Message Date
Mark Salyzyn 419538869d Merge "recovery-persist: pick up both pstore console files"
am: 901f315

* commit '901f31531ba7b7e40e8a9c915467892997d176da':
  recovery-persist: pick up both pstore console files

Change-Id: I7febc439147995adc06b75d1b0de3d30f55719a9
2016-04-05 14:35:53 +00:00
Mark Salyzyn 901f31531b Merge "recovery-persist: pick up both pstore console files" 2016-04-05 14:29:05 +00:00
Mark Salyzyn 5f7111ff4d recovery-persist: pick up both pstore console files
- Volantis console-ramoops-0 (upstream correct)
- Angler console-ramoops
- Bullhead console-ramoops
- Shamu console-ramoops

NB: Shamu also has kernel crashes in other pstore files,
    not merging them in.

Bug: 27176738
Change-Id: Ib6eef3e25475935b89252f51c960719c7860511a
2016-04-04 16:24:48 -07:00
Elliott Hughes dc91161a56 Merge "Move selinux dependencies out of header files."
am: 8124750

* commit '81247500d535dac714fad657860b67474e1f6e42':
  Move selinux dependencies out of header files.

Change-Id: If8fde7a64334327a2b0880a742d784642481ceeb
2016-04-02 16:01:25 +00:00
Elliott Hughes 81247500d5 Merge "Move selinux dependencies out of header files." 2016-04-02 15:53:11 +00:00
Elliott Hughes 4bbd5bf8a6 Move selinux dependencies out of header files.
Bug: http://b/27764900
Change-Id: Ib62a59edcb13054f40f514c404d32b87b14ed5f1
2016-04-01 18:24:39 -07:00
Mark Salyzyn 6f83130d7a Merge "recovery: use __android_log_pmsg_file_write for log files"
am: 75da771

* commit '75da77105f329f5d6c1b4dc46ce02377ec4afd6a':
  recovery: use __android_log_pmsg_file_write for log files

Change-Id: I3da18530294ec71cd24b5ad8c720ab16c3e47dab
2016-03-31 20:57:51 +00:00
Mark Salyzyn 75da77105f Merge "recovery: use __android_log_pmsg_file_write for log files" 2016-03-31 20:49:56 +00:00
Yabin Cui ecc068c2f8 Merge "uncrypt: remove --read-bcb option."
am: ebd22be

* commit 'ebd22be4f742f5eeb32b2eeaf212b34e7605da50':
  uncrypt: remove --read-bcb option.

Change-Id: I06ed6c0a36246041d03c57bc03f532de414c926f
2016-03-30 01:29:42 +00:00
Yabin Cui ebd22be4f7 Merge "uncrypt: remove --read-bcb option." 2016-03-30 01:19:25 +00:00
Yabin Cui 6507265906 uncrypt: remove --read-bcb option.
Bug: 27897241
Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0
(cherry picked from commit 61799baba3)
2016-03-29 18:14:44 -07:00
Tianjie Xu 2e2189728b Merge "Add string for Installing_security_update"
am: 3568004

* commit '3568004cba740a466bd9731a4bb5c8a1475e6d2d':
  Add string for Installing_security_update

Change-Id: I11a147726cd535e574690e01df35ec961888c5c6
2016-03-30 00:05:54 +00:00
Tianjie Xu 3568004cba Merge "Add string for Installing_security_update" 2016-03-29 23:58:31 +00:00
Tianjie Xu 1c95c97e55 Add string for Installing_security_update
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
(cherry picked from commit 1ee0ff3d78)
2016-03-29 13:59:22 -07:00
Elliott Hughes 5cf4701d66 Merge "Switch to <android-base/unique_fd.h>."
am: 5d73735

* commit '5d73735552b3eca103830bd1433ce4b74b54b2b3':
  Switch to <android-base/unique_fd.h>.

Change-Id: I2f03ba036160376f03516eb7ede62229bb8e20ba
2016-03-29 18:00:38 +00:00
Elliott Hughes 5d73735552 Merge "Switch to <android-base/unique_fd.h>." 2016-03-29 17:55:47 +00:00
Elliott Hughes bcabd09293 Switch to <android-base/unique_fd.h>.
Change-Id: I13ba3f40bd52b5f3e3fe9002a45a9a8630040129
2016-03-29 08:18:34 -07:00
Mark Salyzyn a4f701af93 recovery: use __android_log_pmsg_file_write for log files
- Add call to __android_log_pmsg_file_write for recovery logging.
- Add call to refresh pmsg if we reboot back into recovery and then
  allow overwrite of those logs.
- Add a new one-time executable recovery-refresh that refreshes pmsg
  in post-fs phase of init. We rely on pmsg eventually scrolling off
  to age the content after recovery-persist has done its job.
- Add a new one-time executable recovery-persist that transfers from
  pmsg to /data/misc/recovery/ directory if /cache is not mounted
  in post-fs-data phase of init.
- Build and appropriately trigger the above two as required if
  BOARD_CACHEIMAGE_PARTITION_SIZE is undefined.
- Add some simple unit tests

NB: Test failure is expected on systems that do not deliver either
the recovery-persist or recovery-refresh executables, e.g. systems
with /cache. Tests also require a timely reboot sequence of test
to truly verify, tests provide guidance on stderr to direct.

Bug: 27176738
Change-Id: I17bb95980234984f6b2087fd5941b0a3126b706b
2016-03-28 11:07:00 -07:00
Elliott Hughes 2dbd06c7ed Merge "Move recovery_l10n here from development/tools." 2016-03-26 15:45:24 +00:00
Elliott Hughes 3d0153a807 Move recovery_l10n here from development/tools.
Bug: http://b/27837319
Change-Id: I116fc13ae108a59b657f5c9f7efe971de72ac743
2016-03-26 08:42:49 -07:00
Tianjie Xu 3123e5ad94 Merge "Skip stashing source blocks in verify mode" 2016-03-25 22:09:34 +00:00
Tianjie Xu 7eca97e75d Skip stashing source blocks in verify mode
Currently block_image_verify() stashes source blocks to /cache and
in some case triggers I/O errors. To avoid this risk, We create
a map from the hash value to the source blocks' range_set. When
executing stash command in verify mode, source range is saved but block
contents aren't stashed. And load_stash could get its value from
either the stashed file from the previous update, or the contents on
the source partition specified by the saved range.

Bug: 27584487
Bug: 25633753
Change-Id: I775baf4bee55762b6e7b204f8294afc597afd996
(cherry picked from commit 0188935d55)
2016-03-25 14:56:21 -07:00
Tianjie Xu 7e18ce221f Merge "Clean up intent_file related code in recovery.cpp" 2016-03-25 21:03:00 +00:00
Tao Bao 9afbf2af4c Merge "Correct caching behavior for should_inject_cache" 2016-03-25 19:03:28 +00:00
Jed Estep e326b22446 Correct caching behavior for should_inject_cache
Bug: 27800498
Change-Id: I5255283c1d04a385ed719c5bc2be461cae9f3648
(cherry picked from commit 88dd7796a1)
2016-03-25 11:21:12 -07:00
Tianjie Xu c14d95da58 Clean up intent_file related code in recovery.cpp
No one in recovery or framework is utilizing intent file. Clean
up the code.

Bug:27725880
Change-Id: I78b37ff94261793e0d6a86a0fa6d27dcfe3f4783
2016-03-24 12:49:46 -07:00
Elliott Hughes 4cb68121b8 Merge "Remove dead tools." 2016-03-23 19:52:56 +00:00
Elliott Hughes 57eb4fd6e2 Remove dead tools.
None of these have been touched since cupcake, except to keep them building.

Change-Id: I5ed13849e6842e755c62da05f1a8a6da2583b1ee
2016-03-22 21:08:39 -07:00
Tao Bao 867e60db16 Merge "Fix: full ota package larger than 2GB fails to upgrade" 2016-03-21 18:59:31 +00:00
caozhiyuan 2584f9c24d Fix: full ota package larger than 2GB fails to upgrade
Change-Id: I45d9fab8739cc6fa8a0bacaca9238896118d9d7f
Signed-off-by: diruomeng <di.ruomeng@zte.com.cn>
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2016-03-21 10:21:03 -07:00
Alex Deymo 38234f4bef Merge "Add include/ to the Makefile include path." 2016-03-14 21:48:52 +00:00
Alex Deymo 82f8c82046 Add include/ to the Makefile include path.
The applypatch heaaders were recently moved to the include/ directory.
This patch reflects that change in the Makefile.

Bug: None
TEST=sudo emerge imgdiff

Change-Id: I0bf3f991b5e0c98054033c5939ed69b3e3c827a9
2016-03-14 14:25:33 -07:00
Sen Jiang 5593342575 Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." 2016-03-09 01:28:09 +00:00
Sen Jiang ef2016f711 applypatch: add -fPIC for libimgpatch in Chrome OS.
To make the static library position independent.

Bug: 26866274
Test: emerge-peppy imgdiff; sudo emerge imgdiff; emerge nyan imgdiff

Change-Id: I319e721ccfb6a51f63d31afa49f54aa7f607f4bf
2016-03-08 17:02:50 -08:00
Tianjie Xu 90f01a4203 Merge "Reboot and retry on I/O errors"
am: 94dc34148c

* commit '94dc34148c117fd3cfb442a348a69dbbb676a5c5':
  Reboot and retry on I/O errors
2016-03-07 23:57:03 +00:00
Tianjie Xu 94dc34148c Merge "Reboot and retry on I/O errors" 2016-03-07 23:47:14 +00:00
Tao Bao f2726712ea Merge "recovery: Handle devices without /cache partition."
am: 479d9dc2f2

* commit '479d9dc2f2601f5858726913e82aac69c1aa22d2':
  recovery: Handle devices without /cache partition.
2016-03-04 20:26:06 +00:00
Tao Bao 038c294453 Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES."
am: f639490a51

* commit 'f639490a51655a4d372663e2f7000666748d7fda':
  Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.
2016-03-04 20:25:59 +00:00
Tao Bao 479d9dc2f2 Merge "recovery: Handle devices without /cache partition." 2016-03-04 20:17:11 +00:00
Tao Bao f639490a51 Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." 2016-03-04 20:16:50 +00:00
Alex Deymo f6ffefb116 Merge "Restore labels on /postinstall during recovery."
am: 60eae72ac6

* commit '60eae72ac6c35567ea71035d379d4f2300cec77c':
  Restore labels on /postinstall during recovery.
2016-03-04 05:45:27 +00:00
Alex Deymo 60eae72ac6 Merge "Restore labels on /postinstall during recovery." 2016-03-04 05:40:14 +00:00
Tao Bao d80a99883d Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.
If two libraries both use LOCAL_WHOLE_STATIC_LIBRARIES and include a same
library, there would be linking errors when generating a shared library
(or executable) that depends on the two libraries both.

Also clean up Android.mk files.

Remove the "LOCAL_MODULE_TAGS := eng" line for the updater module. The
module will then default to "optional" which won't be built until needed.

Change-Id: I3ec227109b8aa744b7568e7f82f575aae3fe0e6f
2016-03-03 14:52:44 -08:00
Tianjie Xu 3c62b67faf Reboot and retry on I/O errors
When I/O error happens, reboot and retry installation two times
before we abort this OTA update.

Bug: 25633753
Change-Id: Iba6d4203a343a725aa625a41d237606980d62f69
2016-03-02 17:31:05 -08:00
Tao Bao 26112e5870 recovery: Handle devices without /cache partition.
Since we may not have /cache partition on A/B devices, let recovery
handle /cache related operations gracefully if /cache doesn't exist.

(1) Disable the wipe for /cache partition.

(2) Skip wiping /cache while wiping /data (i.e. factory reset).

(3) Disable logging-related features, until we figure out better
ways / places to store recovery logs (mainly for factory resets on A/B
devices).

Bug: 27176738
Change-Id: I7b14e53ce18960fe801ddfc15380dac6ceef1198
2016-03-02 15:33:32 -08:00
Alex Deymo 6bcc8af6e5 Restore labels on /postinstall during recovery.
This patch mirrors what was done in the main init.rc to relabel
/postinstall.

Bug: 27178350
Bug: 27177071
Change-Id: I39cd03f3c55a42c03367957e8c259c9a3155203c
2016-03-02 14:35:51 -08:00
Mattias Nissler ea0e0faae6 Merge "Remove dumpkey build guards after completing code move."
am: 5ffc038be6

* commit '5ffc038be6cffd9155fce4f2212ff351415ee7ba':
  Remove dumpkey build guards after completing code move.
2016-03-01 11:48:54 +00:00
Mattias Nissler 5ffc038be6 Merge "Remove dumpkey build guards after completing code move." 2016-03-01 11:46:27 +00:00
Mattias Nissler b66f047d41 Remove dumpkey build guards after completing code move.
Bug: 27326256
Change-Id: Ia713b23e3c898c1f10af7c61ea67f34601fdcbe3
2016-02-26 11:20:18 +01:00
Mattias Nissler b652678953 Merge "Move dumpkey tool to the recovery repo."
am: 5197fde242

* commit '5197fde242e00d6ee112896846da8d0be6303c56':
  Move dumpkey tool to the recovery repo.
2016-02-26 08:18:02 +00:00