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
Dan Albert
9613bd32f5
am 4eb6c71e
: Merge "Move adb_main to its own file."
...
* commit '4eb6c71e7f013e684828ae6216f61b83be552282':
Move adb_main to its own file.
2015-02-19 18:56:50 +00:00
Dan Albert
4eb6c71e7f
Merge "Move adb_main to its own file."
2015-02-19 18:44:28 +00:00
Dan Albert
9a894b7ece
Move adb_main to its own file.
...
Change-Id: Ia5150e1ef8be5a8f2d2da0fdca9383e22218f4ac
2015-02-19 10:40:17 -08:00
Dan Albert
91f68a4735
am 5d22a5b5
: Merge "Remove dead code."
...
* commit '5d22a5b5ecfd9fce5084915e65e114c8541c084c':
Remove dead code.
2015-02-19 01:25:13 +00:00
Dan Albert
5d22a5b5ec
Merge "Remove dead code."
2015-02-19 01:12:29 +00:00
Dan Albert
3efa676fa6
Remove dead code.
...
This code doesn't exist in the normal adb, so it just makes it harder
to diff the two.
Change-Id: Ibb21b49bb9944c4245199536cbe88e8a107cf00d
2015-02-18 16:44:24 -08:00
Dan Albert
43162fe50c
am 076f5479
: Merge "Use headers from adb."
...
* commit '076f5479b592fc02f2f3e5436cad06b0a35d0521':
Use headers from adb.
2015-02-19 00:28:51 +00:00
Dan Albert
076f5479b5
Merge "Use headers from adb."
2015-02-19 00:17:37 +00:00
Dan Albert
1ddd350504
Use headers from adb.
...
adb.h has diverged a bit, so that one will be more involved, but these
three are all trivial, unimportant changes.
Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6
2015-02-18 16:14:16 -08:00
Dan Albert
61398da24b
am bbf627a6
: Merge "Remove unused code."
...
* commit 'bbf627a68e47319b1fcacb1487ab1d1618c3a82d':
Remove unused code.
2015-02-19 00:10:20 +00:00
Dan Albert
bf1476defe
am 4db055d6
: Merge "Lose USB transport code to libadb."
...
* commit '4db055d66a3d4d8be9f61beb5ee4d25f6346191a':
Lose USB transport code to libadb.
2015-02-18 23:57:04 +00:00
Dan Albert
bbf627a68e
Merge "Remove unused code."
2015-02-18 23:57:00 +00:00
Dan Albert
4db055d66a
Merge "Lose USB transport code to libadb."
2015-02-18 23:42:49 +00:00
Dan Albert
2b2a14ff35
Remove unused code.
...
Change-Id: Ie37734e75bc4d1e284dcb5dee4c0512021663dbd
2015-02-18 15:11:29 -08:00
Dan Albert
8f1bfead3f
Lose USB transport code to libadb.
...
Bug: 17626262
Change-Id: If41031ba20a3a75fa510f155c654a482b47e409d
2015-02-18 15:11:29 -08:00
Dan Albert
ecb0ad25c6
am 37e933a7
: Merge "Add extern "C" to all the headers."
...
* commit '37e933a7cef7f2df1693ff02d34042bc2f039301':
Add extern "C" to all the headers.
2015-02-18 22:57:06 +00:00
Dan Albert
37e933a7ce
Merge "Add extern "C" to all the headers."
2015-02-18 18:44:36 +00:00
Dan Albert
d808d2194f
Add extern "C" to all the headers.
...
Change-Id: Idc249ff1b199b7c455f90092ff2c8a48b539faf4
2015-02-18 10:21:54 -08:00
Elliott Hughes
f8dd04e1a5
am ff934d02
: Merge "Fix Droid and animation color in recovery mode"
...
* commit 'ff934d0257909e9c5420815547a6e2ff89455314':
Fix Droid and animation color in recovery mode
2015-02-12 17:42:11 +00:00
Elliott Hughes
ff934d0257
Merge "Fix Droid and animation color in recovery mode"
2015-02-12 06:21:28 +00:00
Tony Kuo
fd778e3e40
Fix Droid and animation color in recovery mode
...
[Problem]
Droid and animation color in recovery mode are incorrect
[Modify]
- Add support for flipping (zero copy) with RECOVERY_ABGR.
- Decodes PNG files to BGRA directly, and other fills, text and alpha blending are also done directly in BGRA (i.e. blits can still bypass conversion)
- Remove the BGRA workaround added previous for single buffer mode (f766396
)
Bug:19216535
Change-Id: Ie864419fc6da776ff58b2d02e130f203c194500f
Signed-off-by: Tony Kuo <tony.kuo@mediatek.com>
2015-02-11 21:36:00 -08:00
Elliott Hughes
adf71bf71d
am 5db3f978
: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"
...
* commit '5db3f97877c0aafd4513c3ed846c48b0fc148b0e':
Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
2015-02-11 01:55:05 +00:00
Elliott Hughes
5db3f97877
Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"
2015-02-11 01:37:49 +00:00
Elliott Hughes
98e2c509a6
am 78aa50d3
: Merge "recovery: Handle EV_SW events"
...
* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
recovery: Handle EV_SW events
2015-02-11 00:33:17 +00:00