Commit Graph
1030 Commits
Author SHA1 Message Date
Narayan KamathandAndroid Git Automerger 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 KamathandGerrit Code Review 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 AlbertandAndroid Git Automerger eef962bfd9 am 9255ad4a: Merge "Fix readx/writex names."
* commit '9255ad4a4f46dc7781b180d0cffce2d616adebcf':
  Fix readx/writex names.
2015-02-25 23:17:58 +00:00
Dan AlbertandGerrit Code Review 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
Dan AlbertandAndroid Git Automerger 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 AlbertandGerrit Code Review 12fa5191e7 Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft." 2015-02-25 18:04:55 +00:00
Narayan KamathandAndroid Git Automerger 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 KamathandGerrit Code Review 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 AlbertandAndroid Git Automerger 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 AlbertandGerrit Code Review 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 KamathandAndroid Git Automerger 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 KamathandGerrit Code Review 829d392a75 Merge "Delete unused functions from minzip." 2015-02-24 13:14:40 +00:00
Narayan KamathandAndroid Git Automerger 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 KamathandGerrit Code Review 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 AlbertandAndroid Git Automerger 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 AlbertandGerrit Code Review 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 AlbertandGerrit Code Review 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 AlbertandGerrit Code Review 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 AlbertandGerrit Code Review 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 AlbertandGerrit Code Review bbf627a68e Merge "Remove unused code." 2015-02-18 23:57:00 +00:00
Dan AlbertandGerrit Code Review 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 AlbertandGerrit Code Review 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 HughesandAndroid Git Automerger 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 HughesandGerrit Code Review ff934d0257 Merge "Fix Droid and animation color in recovery mode" 2015-02-12 06:21:28 +00:00
Tony KuoandElliott Hughes 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 HughesandAndroid Git Automerger 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 HughesandGerrit Code Review 5db3f97877 Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" 2015-02-11 01:37:49 +00:00
Elliott HughesandAndroid Git Automerger 98e2c509a6 am 78aa50d3: Merge "recovery: Handle EV_SW events"
* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
  recovery: Handle EV_SW events
2015-02-11 00:33:17 +00:00
Elliott HughesandAndroid Git Automerger ee7127cca5 am bf0be350: Merge "recovery: Generate libminui dynamic library"
* commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0':
  recovery: Generate libminui dynamic library
2015-02-11 00:33:16 +00:00
Elliott HughesandGerrit Code Review 78aa50d349 Merge "recovery: Handle EV_SW events" 2015-02-11 00:28:56 +00:00
Ajay DudaniandElliott Hughes 07d9627d7c recovery: Handle EV_SW events
Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
2015-02-10 16:28:07 -08:00
Elliott HughesandGerrit Code Review bf0be350dd Merge "recovery: Generate libminui dynamic library" 2015-02-11 00:26:18 +00:00
Ajay DudaniandElliott Hughes 9905f3a4ee recovery: Generate libminui dynamic library
Allow factory test images to use minui functionaltiy
by making use of libminui dynamic library.

Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
2015-02-10 16:25:17 -08:00
Elliott Hughes dcbf4fc571 resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp
Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
2015-02-10 16:20:53 -08:00
Elliott HughesandGerrit Code Review 35efcd275f Merge "recovery: Properly detect userdebug or eng builds" 2015-02-10 23:55:45 +00:00