Commit graph

1360 commits

Author SHA1 Message Date
Ying Wang
af48901be1 am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the recovery image."
* commit 'cc368fdea6e5415be541dadfe04107b76a82c537':
  Install the recovery binary directly to the recovery image.
2015-03-12 21:33:39 +00:00
Tao Bao
d5369e5d91 am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
* commit '18f371d814b26132aadf11de6cc305f02484535a':
  updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
2015-03-11 18:03:57 +00:00
Ying Wang
cc368fdea6 am 8290aa50: Merge "Install the recovery binary directly to the recovery image."
* commit '8290aa501f1b0354262c304962bc4da2e30457a8':
  Install the recovery binary directly to the recovery image.
2015-03-11 17:57:01 +00:00
Ying Wang
8290aa501f Merge "Install the recovery binary directly to the recovery image." 2015-03-11 17:41:40 +00:00
Ying Wang
2196a3eda0 Install the recovery binary directly to the recovery image.
This eliminated the previous hack, that doesn't work reliably with the
"LOCAL_REQUIRED_MODULES := mkfs.f2fs".

Bug: 19666886
Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
2015-03-11 10:39:43 -07:00
Tao Bao
18f371d814 updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
Return NULL to abort the update process. Note that returning ""
won't stop the script.

Change-Id: Ifd108c1356f7c92a905c8776247a8842c6445319
2015-03-11 09:53:56 -07:00
Ying Wang
5a50b1bce5 Install the recovery binary directly to the recovery image.
This eliminated the previous hack, that doesn't work reliably with the
"LOCAL_REQUIRED_MODULES := mkfs.f2fs".

Bug: 19666886
Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
2015-03-10 11:58:37 -07:00
Narayan Kamath
00c9857867 am fb7d8965: am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."
* commit 'fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7':
  Remove more dead code from minzip.
2015-02-27 17:16:04 +00:00
Narayan Kamath
fb7d896595 am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."
* commit '023e4374469b8cae68783036b6977ea721c1e07a':
  Remove more dead code from minzip.
2015-02-27 17:10:25 +00:00
Narayan Kamath
023e437446 am 579b9299: (-s ours) Merge "Remove more dead code from minzip."
* commit '579b92991ccd626527c75042aca032d3ac4207a2':
  Remove more dead code from minzip.
2015-02-27 17:04:43 +00:00
Dan Albert
d1b078df33 am 66f94728: am 3deba524: am ecead276: Merge "Add tests for read_block_adb."
* commit '66f94728ef2f4ac09c42c4623ec45d5eac6e9d53':
  Add tests for read_block_adb.
2015-02-27 16:53:58 +00:00
Dan Albert
66f94728ef am 3deba524: am ecead276: Merge "Add tests for read_block_adb."
* commit '3deba524f9d1e94b613d9c13f4c76595f0ec99ab':
  Add tests for read_block_adb.
2015-02-27 16:45:43 +00:00
Dan Albert
3deba524f9 am ecead276: Merge "Add tests for read_block_adb."
* commit 'ecead276f068cb53bddb2458b200aa96473ddfb3':
  Add tests for read_block_adb.
2015-02-27 16:37:40 +00:00
Narayan Kamath
579b92991c Merge "Remove more dead code from minzip." 2015-02-27 14:20:19 +00:00
Narayan Kamath
e57c62a007 Remove more dead code from minzip.
I've added explanatory comments to mzExtractRecursive because
that function will live on as a utility even after we move the
zip format related logic to libziparchive.

bug: 19472796

Change-Id: Id69db859b9b90c13429134d40ba72c1d7c17aa8e
2015-02-27 14:19:59 +00:00
Narayan Kamath
9c0f5d6b34 Remove more dead code from minzip.
I've added explanatory comments to mzExtractRecursive because
that function will live on as a utility even after we move the
zip format related logic to libziparchive.

bug: 19472796

(cherry-picked from commit c9ccdfd7a42de08c47ab771b94dc5b9d1f957b95)

Change-Id: I8b7fb6fa3eafb2e7ac080ef7a7eceb691b252d8a
2015-02-27 12:58:16 +00:00
Dan Albert
ecead276f0 Merge "Add tests for read_block_adb." 2015-02-27 01:08:28 +00:00
Dan Albert
ffd6c31a77 Add tests for read_block_adb.
These tests aren't completely representative in that they don't run in
the recovery image. We might want to look in to adding a self-test
option to the recovery UI. Until then, these can be run on a normal
device (which is easier to do anyway).

Bug: 19522788
Change-Id: Idb20feb55d10c62905c2480ab1b61a2e4b5f60d8
2015-02-26 17:00:11 -08:00
Jesse Zhao
670a0c6fe9 am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.
* commit '0257d107f2039e24e4fbdd98d7536f402628bd78':
  Bump up max_map_count value.
2015-02-27 00:03:58 +00:00
Jesse Zhao
0257d107f2 am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.
* commit '71c454293118c51487a62c5d7c4da6262eae691c':
  Bump up max_map_count value.
2015-02-26 23:57:04 +00:00
Jesse Zhao
71c4542931 am f66bf339: am 3e91f691: Bump up max_map_count value.
* commit 'f66bf33956eebba26bedc7f098dedc8a2c1cf942':
  Bump up max_map_count value.
2015-02-26 23:34:49 +00:00
Dan Albert
cd70624436 am 9b14c4b0: am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write."
* commit '9b14c4b0e8b8b102c699b554d701e461e7e562e7':
  This read accidentally got turned in to a write.
2015-02-26 23:32:45 +00:00
Dan Albert
9b14c4b0e8 am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write."
* commit '735a0f0fc3de936db3ce5a99dbcf02e970d47ba0':
  This read accidentally got turned in to a write.
2015-02-26 23:23:26 +00:00
Jesse Zhao
f66bf33956 am 3e91f691: Bump up max_map_count value.
* commit '3e91f691a6bf6b154ea98982b073e84e86328baf':
  Bump up max_map_count value.
2015-02-26 23:20:35 +00:00
Dan Albert
735a0f0fc3 am cab0beb9: Merge "This read accidentally got turned in to a write."
* commit 'cab0beb95adce79b0c33488b5a503cac7dca6e77':
  This read accidentally got turned in to a write.
2015-02-26 23:08:09 +00:00
Dan Albert
cab0beb95a Merge "This read accidentally got turned in to a write." 2015-02-26 21:59:32 +00:00
Dan Albert
190977157b This read accidentally got turned in to a write.
Too many mechanical changes in a row...

Bug: 19522788
Change-Id: Ic451792aab2700cdbdbb64529b99ff5f567918ad
2015-02-26 13:57:03 -08:00
Narayan Kamath
ac46c47e98 am d9bbeaec: am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"
* commit 'd9bbeaec5a12074928f026af47de2b92f2a34336':
  Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
2015-02-26 18:16:09 +00:00
Narayan Kamath
d9bbeaec5a am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"
* commit '83e5d1dc73116a154cd7387547c8dd858fd497aa':
  Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
2015-02-26 17:56:46 +00:00
Narayan Kamath
83e5d1dc73 am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"
* commit 'c9bc3cc92a2c2f584b28049238c4a583c80f149d':
  Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
2015-02-26 17:49:13 +00:00
Narayan Kamath
c9bc3cc92a Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk" 2015-02-26 17:43:40 +00:00
Trevor Drake
fee324f1b6 Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
The zlib include was not required. libpng is now handled by referencing
the libpng static library

Change-Id: Ie4e0abad3fff5b763eba363d3d0fa96128ff49bc
2015-02-26 15:57:58 +00:00
Dan Albert
11020eae5b am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."
* commit '381f64165153bfd4747b99baf838fa280d402d5e':
  Fix readx/writex names.
2015-02-25 23:32:48 +00:00
Dan Albert
381f641651 am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."
* commit 'eef962bfd90f11ef2f936e57270c85293af60e5f':
  Fix readx/writex names.
2015-02-25 23:24:36 +00:00
Dan Albert
eef962bfd9 am 9255ad4a: Merge "Fix readx/writex names."
* commit '9255ad4a4f46dc7781b180d0cffce2d616adebcf':
  Fix readx/writex names.
2015-02-25 23:17:58 +00:00
Dan Albert
9255ad4a4f Merge "Fix readx/writex names." 2015-02-25 23:11:38 +00:00
Dan Albert
432584fccc Fix readx/writex names.
Change-Id: I9556960b8293ea0e81def8b73f88edadb68841e3
2015-02-25 15:08:15 -08:00
Jesse Zhao
3e91f691a6 Bump up max_map_count value.
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
(cherry picked from commit 5bf74b238b)
2015-02-25 22:47:26 +00:00
Dan Albert
f0a7b0db2d am 94cb7fdc: am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."
* commit '94cb7fdc45db013c0ad6b8edc536717c6eb812a8':
  Remove _(GNU|XOPEN)_SORUCE makefile cruft.
2015-02-25 18:20:21 +00:00
Dan Albert
94cb7fdc45 am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."
* commit 'd795dcc5ead7328c1b3fcb14e279c4bec6a38b50':
  Remove _(GNU|XOPEN)_SORUCE makefile cruft.
2015-02-25 18:12:57 +00:00
Dan Albert
d795dcc5ea am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."
* commit '12fa5191e76d119f4f3998a4b8821f87aa4f9fad':
  Remove _(GNU|XOPEN)_SORUCE makefile cruft.
2015-02-25 18:09:14 +00:00
Dan Albert
12fa5191e7 Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft." 2015-02-25 18:04:55 +00:00
Narayan Kamath
292baa0ddb am 07d2542d: am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."
* commit '07d2542d870d4bb92c9cfb85bd0ac8f9bf7ba4c4':
  Fix LP64 build for minadbd.
2015-02-25 17:04:59 +00:00
Dan Albert
d87f963238 am 8007a21e: am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."
* commit '8007a21e799ec05a45435d4b688116e88de98221':
  Fix build from implicit declaration.
2015-02-25 17:04:58 +00:00
Narayan Kamath
07d2542d87 am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."
* commit 'b3f4ed86e95a1270258b288cfb22c42c6f163efc':
  Fix LP64 build for minadbd.
2015-02-25 16:53:04 +00:00
Dan Albert
8007a21e79 am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."
* commit '6deb3d5cf266ce18aefb819c5994f504e0df103b':
  Fix build from implicit declaration.
2015-02-25 16:52:58 +00:00
Narayan Kamath
b3f4ed86e9 am 82eea3fd: Merge "Fix LP64 build for minadbd."
* commit '82eea3fdd77f458e94d87ef0db0bd3b745d096ff':
  Fix LP64 build for minadbd.
2015-02-25 15:26:56 +00:00
Narayan Kamath
82eea3fdd7 Merge "Fix LP64 build for minadbd." 2015-02-25 15:23:07 +00:00
Narayan Kamath
017db6d89e Fix LP64 build for minadbd.
services.c:57:12: error: format '%llu' expects argument of type 'long
  long unsigned int', but argument 2 has type 'uint64_t' [-Werror=format=]

Change-Id: Ieba691bf9e7a30c8bb38f4e1f36e86b6ea3f8c80
2015-02-25 15:21:28 +00:00
Dan Albert
2404370589 Remove _(GNU|XOPEN)_SORUCE makefile cruft.
None of the functions needing these are used.

Change-Id: Ibe3ca24d993788bf2f1108bac8417a7094ef386b
2015-02-24 22:41:07 -08:00