Commit Graph

13005 Commits

Author SHA1 Message Date
Andreas Gampe 623eebe68f Merge "Libcutils: Remove unused variable" 2015-02-20 00:57:33 +00:00
Andreas Gampe 7f71a45a17 Libcutils: Remove unused variable
Change-Id: I95eed017e78468c4946b2a5b62b6fe92e256673e
2015-02-19 16:54:32 -08:00
Dan Albert c9389b856c am 3b83ed30: am dbe484d2: am 7e84308b: Merge "Lose adb.c and sockets.c to libadb."
* commit '3b83ed301c6aba24d5fc453eb094d548f7061e34':
  Lose adb.c and sockets.c to libadb.
2015-02-20 00:37:09 +00:00
Bill Yi 4ab8d4d242 am e98ae10a: am 0cc8da09: Merge commit \'9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31\' into HEAD
* commit 'e98ae10aed2fbc5aab09d9547818c6e6d9c1789a':
2015-02-20 00:37:08 +00:00
Dan Albert 3b83ed301c am dbe484d2: am 7e84308b: Merge "Lose adb.c and sockets.c to libadb."
* commit 'dbe484d25f0ee34b1de5b2820de7fa240113091d':
  Lose adb.c and sockets.c to libadb.
2015-02-20 00:23:43 +00:00
Bill Yi e98ae10aed am 0cc8da09: Merge commit \'9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31\' into HEAD
* commit '0cc8da09473affeb8a396b92813e5f8ce5500292':
2015-02-20 00:23:31 +00:00
Dan Albert dbe484d25f am 7e84308b: Merge "Lose adb.c and sockets.c to libadb."
* commit '7e84308b74e2757d19610aaf8653aa1e244b8149':
  Lose adb.c and sockets.c to libadb.
2015-02-20 00:05:31 +00:00
Dan Albert 7e84308b74 Merge "Lose adb.c and sockets.c to libadb." 2015-02-19 23:47:18 +00:00
Bill Yi 0cc8da0947 Merge commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31' into HEAD 2015-02-19 14:33:24 -08:00
Dan Albert e1ca623faa Lose adb.c and sockets.c to libadb.
Also kill the device side libadb. This was added for the now dead
device side adb, and is no longer used.

Bug: 17626262
Change-Id: I3b28915641fd5b4f16fc86cf1f4f4e9711093001
2015-02-19 13:49:35 -08:00
Dan Albert 865c9d93d3 am 4735a4fd: am 18daa159: Merge "Document the behavior of props affecting adb root."
* commit '4735a4fd67ea64b4fc5da225235f7d977db2a778':
  Document the behavior of props affecting adb root.
2015-02-19 21:02:58 +00:00
Dan Albert 1c86f66894 am 80cd32ae: am 63feeaaa: Merge "Fix Windows adb build."
* commit '80cd32ae640902e548ea0a7ed738b04b4a97fce5':
  Fix Windows adb build.
2015-02-19 20:54:02 +00:00
Dan Albert 8118e3de46 am 28620196: am 9a525d7f: Merge "Move adb_main to its own file."
* commit '286201969f29b5387870d719f500a27a7865c251':
  Move adb_main to its own file.
2015-02-19 20:53:39 +00:00
Dan Albert 47ee27d84e am afdd5be1: am 915d2e98: Merge "Move the listener code into its own file."
* commit 'afdd5be1fbf4dca8e9cd717862880b0d01b7f070':
  Move the listener code into its own file.
2015-02-19 20:53:38 +00:00
Dan Albert d7544a547b am 5c333f72: am e1f2080f: Merge "Move the adb auth code into its own file."
* commit '5c333f7216707753d9fd2d41bf5a32905d8a2006':
  Move the adb auth code into its own file.
2015-02-19 20:53:37 +00:00
Dan Albert 4735a4fd67 am 18daa159: Merge "Document the behavior of props affecting adb root."
* commit '18daa159ec5f8455f83dd87dad1a1ed1d2501b3e':
  Document the behavior of props affecting adb root.
2015-02-19 20:46:41 +00:00
Dan Albert 18daa159ec Merge "Document the behavior of props affecting adb root." 2015-02-19 20:33:31 +00:00
Dan Albert 13f9c406d7 Document the behavior of props affecting adb root.
Change-Id: Icfdc3ba696556d6db64835e61dde6f40b491d1a7
2015-02-19 12:29:01 -08:00
Dan Albert 8faf91a3ac am 6ff730b6: am 1403aa36: Merge "Move emulator tracing into its own file."
* commit '6ff730b67804ca4f5a4b2c67784e127f6e762e11':
  Move emulator tracing into its own file.
2015-02-19 20:26:34 +00:00
Dan Albert 80cd32ae64 am 63feeaaa: Merge "Fix Windows adb build."
* commit '63feeaaa0608e63969f434456ddaa32bf85bd220':
  Fix Windows adb build.
2015-02-19 19:48:56 +00:00
Dan Albert 63feeaaa06 Merge "Fix Windows adb build." 2015-02-19 19:37:24 +00:00
Dan Albert 6795cd8db5 Fix Windows adb build.
Change-Id: I560bedfcf77556b36acadc19f5dac71b3628ea2b
2015-02-19 11:36:53 -08:00
Dan Albert 286201969f am 9a525d7f: Merge "Move adb_main to its own file."
* commit '9a525d7f2e050a81fd800557293fc3ce6d4933ff':
  Move adb_main to its own file.
2015-02-19 18:56:52 +00:00
Dan Albert afdd5be1fb am 915d2e98: Merge "Move the listener code into its own file."
* commit '915d2e98eb8888d4ddd800efece70261b4cb7259':
  Move the listener code into its own file.
2015-02-19 18:56:51 +00:00
Dan Albert 5c333f7216 am e1f2080f: Merge "Move the adb auth code into its own file."
* commit 'e1f2080f6700e2392ce7c52984b2e19014e91574':
  Move the adb auth code into its own file.
2015-02-19 18:56:50 +00:00
Dan Albert 9a525d7f2e Merge "Move adb_main to its own file." 2015-02-19 18:44:17 +00:00
Dan Albert 915d2e98eb Merge "Move the listener code into its own file." 2015-02-19 18:44:11 +00:00
Dan Albert e1f2080f67 Merge "Move the adb auth code into its own file." 2015-02-19 18:44:04 +00:00
Narayan Kamath 5955a9f5e4 Remove reference to NOT_USING_KLIBC and cygwin.
The reference to NOT_USING_KLIBC appears to be the only one
in our codebase. This change also removes some cygwin specific
retry logic - all other supported platforms in this section
of the code should support mapping at an offset.

Note that i've reversed the sense of the check, we always sysconf
since that's recommended practice.

Change-Id: Ib985fb665193d7a07a282f7092cd77c0bc508a66
2015-02-19 18:36:27 +00:00
Elliott Hughes 59f34c0059 am dbfb9719: am 1af18c3c: Merge "Fix build."
* commit 'dbfb9719d7d2c6bd968790d28312d0837e27b8de':
  Fix build.
2015-02-19 17:36:35 +00:00
Dan Albert bd0b750897 Move adb_main to its own file.
Change-Id: If6e98c089b39f73bd8f4a878a82669bfeee367f3
2015-02-18 18:32:54 -08:00
Dan Albert e9fca14c9e Move the listener code into its own file.
Change-Id: I7332455ed1a213daedeaa4a81260edf08b2fd131
2015-02-18 18:22:52 -08:00
Dan Albert ba3a251749 Move the adb auth code into its own file.
Change-Id: I84cf0bd7777f0147119e7c6afc4096c2e93156a2
2015-02-18 18:22:52 -08:00
Dan Albert 6ff730b678 am 1403aa36: Merge "Move emulator tracing into its own file."
* commit '1403aa36b2d9d0c295402a935bb07ea661536fcb':
  Move emulator tracing into its own file.
2015-02-19 02:21:45 +00:00
Dan Albert 1403aa36b2 Merge "Move emulator tracing into its own file." 2015-02-19 02:10:10 +00:00
Dan Albert 21c3eaf4cc Move emulator tracing into its own file.
adb.c is far too monolithic.

Change-Id: I4a9ee97927e4a96a38ea5859d84efac86bfdfc35
2015-02-18 17:21:17 -08:00
Elliott Hughes dbfb9719d7 am 1af18c3c: Merge "Fix build."
* commit '1af18c3c98bfe003da4b7eede4a90c5dc9c9e9d2':
  Fix build.
2015-02-19 01:12:42 +00:00
Elliott Hughes 1af18c3c98 Merge "Fix build." 2015-02-19 00:59:36 +00:00
Elliott Hughes 4c9d24a3ed Fix build.
Change-Id: I31fc562068ebbba5e9872ee91694feb611fc957f
2015-02-18 16:57:30 -08:00
Elliott Hughes 1a015262a7 am e8637db8: am 8e16a7e2: Merge "adb: add "adb unroot" to restart adb in non-root mode"
* commit 'e8637db821cdcbcc30767c4a278bb58eee057019':
  adb: add "adb unroot" to restart adb in non-root mode
2015-02-19 00:38:55 +00:00
Elliott Hughes e8637db821 am 8e16a7e2: Merge "adb: add "adb unroot" to restart adb in non-root mode"
* commit '8e16a7e2a3506b6f526a503bd03e3919235dde71':
  adb: add "adb unroot" to restart adb in non-root mode
2015-02-19 00:33:47 +00:00
Elliott Hughes 8e16a7e2a3 Merge "adb: add "adb unroot" to restart adb in non-root mode" 2015-02-19 00:18:38 +00:00
Dan Albert 590bcff373 am a616f624: am 2268788a: Merge "Move USB transport code to libadb."
* commit 'a616f6240ac9dbc3ac09611db56ebc8db42a2cfe':
  Move USB transport code to libadb.
2015-02-19 00:00:10 +00:00
Dan Albert a616f6240a am 2268788a: Merge "Move USB transport code to libadb."
* commit '2268788ae4b56991a708625009be5531b9d63cd0':
  Move USB transport code to libadb.
2015-02-18 23:53:34 +00:00
Dan Albert 2268788ae4 Merge "Move USB transport code to libadb." 2015-02-18 23:42:42 +00:00
Yabin Cui a5beecd30c am e1d84768: am b703214e: Merge "Move sprintf to snprintf."
* commit 'e1d847685a1102905c68bf895a3d148efe6c2c47':
  Move sprintf to snprintf.
2015-02-18 23:04:40 +00:00
Dan Albert ff86a37e2f am 23cb0149: am 1ac334ec: Merge "Add extern "C" to all the adb headers."
* commit '23cb014927e780a8cf8f4c9ae493a9bcaee69305':
  Add extern "C" to all the adb headers.
2015-02-18 23:04:39 +00:00
Dan Albert cfdd291b86 am 90ffa2d0: am 32e872ca: Merge "Ignore useless cpplint messages in adb."
* commit '90ffa2d0ebc0736445c703eba832310e01ac9d28':
  Ignore useless cpplint messages in adb.
2015-02-18 23:04:38 +00:00
Yabin Cui e1d847685a am b703214e: Merge "Move sprintf to snprintf."
* commit 'b703214e25e6752037d013faf5edc80c4776dfa4':
  Move sprintf to snprintf.
2015-02-18 22:57:09 +00:00
Dan Albert 23cb014927 am 1ac334ec: Merge "Add extern "C" to all the adb headers."
* commit '1ac334ec660292298917668a40fc5239b1fdaa56':
  Add extern "C" to all the adb headers.
2015-02-18 22:57:08 +00:00