Commit Graph

1132 Commits

Author SHA1 Message Date
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
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
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 8d29f4cab3 am 218dab7f: am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip."
* commit '218dab7fdafbc613aa54d1fad0de0dcadd575186':
  Delete unused functions from minzip.
2015-02-24 13:31:07 +00: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 20f746b11c am 37e68a1d: am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."
* commit '37e68a1d800cbe6eb28c3405fb3ecccb0119e03e':
  Fix a printf format warning.
2015-02-24 13:15:47 +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 a89ed9e16c am dda456b5: am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd."
* commit 'dda456b5da3d59a71b486aa85912dec65b3089b2':
  Kill of most of the remainder of minadbd.
2015-02-20 00:30:46 +00:00
Bill Yi 5dc9451177 am a1df1a77: am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD
* commit 'a1df1a778826742eeef11ed449bcffb95e119c80':
2015-02-20 00:30:46 +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 1212762a6e am 9613bd32: am 4eb6c71e: Merge "Move adb_main to its own file."
* commit '9613bd32f5d19476063e4c546ad806385eed203c':
  Move adb_main to its own file.
2015-02-19 20:53:36 +00:00
Dan Albert 5748a029de am 91f68a47: am 5d22a5b5: Merge "Remove dead code."
* commit '91f68a4735e7ca9facaf0bad45a97e7ea25213c4':
  Remove dead code.
2015-02-19 20:26:14 +00: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