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
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
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
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
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
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
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
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
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
Dan Albert
6deb3d5cf2
am 35fbf787: Merge "Fix build from implicit declaration."
...
* commit '35fbf7876059b64d069d60fd9eab761718344271':
Fix build from implicit declaration.
2015-02-25 06:13:59 +00:00
Dan Albert
35fbf78760
Merge "Fix build from implicit declaration."
2015-02-25 06:09:24 +00:00
Dan Albert
8f6eb5c045
Fix build from implicit declaration.
...
Turn the warning on by default and turn on -Werror so this doesn't
happen next time.
Change-Id: Id65bf0cb63bbf0ff224655b425463ae2f55435df
2015-02-24 22:07:18 -08:00
Narayan Kamath
218dab7fda
am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip."
...
* commit '6f58e899be728fc2ab3cf3902e52937ebd58e02d':
Delete unused functions from minzip.
2015-02-24 13:25:06 +00:00
Narayan Kamath
6f58e899be
am 829d392a: Merge "Delete unused functions from minzip."
...
* commit '829d392a75f536861adfddefc21ec635f3460144':
Delete unused functions from minzip.
2015-02-24 13:18:14 +00:00
Narayan Kamath
829d392a75
Merge "Delete unused functions from minzip."
2015-02-24 13:14:40 +00:00
Narayan Kamath
37e68a1d80
am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."
...
* commit 'f9ee77ab52941e6f3be8e97fb0a150480ea8760a':
Fix a printf format warning.
2015-02-24 13:09:02 +00:00
Narayan Kamath
f9ee77ab52
am 9e95c515: Merge "Fix a printf format warning."
...
* commit '9e95c515dc2e7afa91d4a4c5163ffd5b6eae3b31':
Fix a printf format warning.
2015-02-24 13:01:00 +00:00
Narayan Kamath
9e95c515dc
Merge "Fix a printf format warning."
2015-02-24 12:56:15 +00:00
Narayan Kamath
d84b055972
Fix a printf format warning.
...
warning: format '%lu' expects argument of type 'long unsigned int', but
argument 3 has type 'unsigned int' [-Wformat] sizeof(RangeSet) + num * sizeof(int));
Change-Id: I4a3c6fc8d40c08ea84f8f5ee13f39350e4264027
2015-02-23 13:39:41 +00:00
Narayan Kamath
3e700cff53
Delete unused functions from minzip.
...
This is in preparation of replacing it with libziparchive and
providing shim wrappers.
bug: 19472796
Change-Id: I1f2fb59ee7a41434e794e4ed15b754aa2b74a11d
2015-02-23 13:29:16 +00:00
Dan Albert
dda456b5da
am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd."
...
* commit '552fceb85cde45581ef04a23a2e76e6298ed15a5':
Kill of most of the remainder of minadbd.
2015-02-20 00:23:43 +00:00
Bill Yi
a1df1a7788
am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD
...
* commit 'c2b60b9870955c14ec8434353d617ebca6f44368':
2015-02-20 00:22:48 +00:00
Dan Albert
552fceb85c
am 2d102225: Merge "Kill of most of the remainder of minadbd."
...
* commit '2d1022250941873f8748e6a159d4e5bf976e511f':
Kill of most of the remainder of minadbd.
2015-02-20 00:05:30 +00:00
Dan Albert
2d10222509
Merge "Kill of most of the remainder of minadbd."
2015-02-19 23:47:22 +00:00
Dan Albert
f3a5726919
Kill of most of the remainder of minadbd.
...
I think everything left now is here to stay (services.c might get
massaged in to libadbd if it gets refactored).
Bug: 17626262
Change-Id: I01faf8b277a601a40e3a0f4c3b8206c97f1d2ce6
2015-02-19 15:41:35 -08:00
Bill Yi
c2b60b9870
Merge commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828' into HEAD
2015-02-19 14:30:26 -08:00