Commit graph

12024 commits

Author SHA1 Message Date
Mark Salyzyn
4bb4e626c3 am cd9ea7ad: am 5526a897: Merge "init: grab-bootchart.sh: run bootchart and display results"
* commit 'cd9ea7ad303a5787eae70dc74293f788457a15e5':
  init: grab-bootchart.sh: run bootchart and display results
2015-02-25 16:52:28 +00:00
Dan Albert
01ba758282 am 2c504467: am d6e9a1f5: Merge "Fix Mac build."
* commit '2c5044675b1abfae08ce1c5926e02db2272692ca':
  Fix Mac build.
2015-02-25 16:52:27 +00:00
Dan Albert
7998e6c50f am 4868ec8c: am a63b7d59: Merge "Fix Windows SDK build."
* commit '4868ec8cc28f3cf53c76dd998ba102e096faa1f6':
  Fix Windows SDK build.
2015-02-25 16:52:23 +00:00
Elliott Hughes
34af320ed7 am aaa61ab9: am db3a5d98: Merge "Add missing <stdlib.h> to adb_listeners.c."
* commit 'aaa61ab91e668465d0e14063a4e8694607b5af78':
  Add missing <stdlib.h> to adb_listeners.c.
2015-02-25 16:52:08 +00:00
Dan Albert
7fe1e6c3e5 am a1e60d68: am a75b4935: Merge "Move more into libadb and libadbd."
* commit 'a1e60d6822ee466c30a37b3f45a450f2ca2ef46d':
  Move more into libadb and libadbd.
2015-02-25 16:52:03 +00:00
Dan Albert
50e536691d am 04cf174f: am 9f3540d0: Merge "Oops. Fix make variable name. Thanks again, make."
* commit '04cf174fbbaa9e3dd72c0167a28da2967759eb7f':
  Oops. Fix make variable name. Thanks again, make.
2015-02-25 16:52:01 +00:00
Dan Albert
a130ddf763 am 4255cbd1: am 8ef39424: Merge "Ignore another stupid lint warning."
* commit '4255cbd1754e5cfa3563ffc9a6eace631ec36ae3':
  Ignore another stupid lint warning.
2015-02-25 16:52:00 +00:00
Mark Salyzyn
cd9ea7ad30 am 5526a897: Merge "init: grab-bootchart.sh: run bootchart and display results"
* commit '5526a897d3cc2638eca713a76c2cf90aa8292e7a':
  init: grab-bootchart.sh: run bootchart and display results
2015-02-24 22:33:59 +00:00
Dan Albert
2c5044675b am d6e9a1f5: Merge "Fix Mac build."
* commit 'd6e9a1f5a357663ce4a42155829420b263996eb3':
  Fix Mac build.
2015-02-24 22:33:58 +00:00
Mark Salyzyn
5526a897d3 Merge "init: grab-bootchart.sh: run bootchart and display results" 2015-02-24 22:30:49 +00:00
Dan Albert
d6e9a1f5a3 Merge "Fix Mac build." 2015-02-24 22:28:54 +00:00
Dan Albert
fdf8722491 Fix Mac build.
Prior to https://android-review.googlesource.com/#/c/134253/ the
makefile had assumed !Windows was the same as Linux, so the Mac was
actually getting all the Linux sources as well. I mistakenly didn't
add fdevent.cpp to the Darwin sources in that change.

Change-Id: I4e12a394e9a2baf7c1e3c711a01a6b5fccbf79d9
2015-02-24 14:27:33 -08:00
Dan Albert
4868ec8cc2 am a63b7d59: Merge "Fix Windows SDK build."
* commit 'a63b7d595b9cb35b7493662daf8840835229c7fb':
  Fix Windows SDK build.
2015-02-24 22:15:12 +00:00
Dan Albert
a63b7d595b Merge "Fix Windows SDK build." 2015-02-24 22:09:58 +00:00
Dan Albert
88cf1c8c4a Fix Windows SDK build.
Change-Id: I9c0f9c92c28867ff17f1ec83aac935d18348c335
2015-02-24 14:08:03 -08:00
Mark Salyzyn
d4e5c32af7 init: grab-bootchart.sh: run bootchart and display results
- KISS as all options are now passed to adb for better or worse
- runs bootchart and immediately displays the results

Bug: 19485335
Bug: 18390773
Change-Id: Id32930031371d0368e605810f0c998232a1d4f16
2015-02-24 13:56:43 -08:00
Elliott Hughes
aaa61ab91e am db3a5d98: Merge "Add missing <stdlib.h> to adb_listeners.c."
* commit 'db3a5d984eb962ec64988404a7ba0361e4af214c':
  Add missing <stdlib.h> to adb_listeners.c.
2015-02-24 20:42:36 +00:00
Elliott Hughes
db3a5d984e Merge "Add missing <stdlib.h> to adb_listeners.c." 2015-02-24 20:37:54 +00:00
Elliott Hughes
3b967f52f2 Add missing <stdlib.h> to adb_listeners.c.
Change-Id: If9505880a33131b27bfaa19f3efd45c83a6810ed
2015-02-24 12:37:13 -08:00
Dan Albert
a1e60d6822 am a75b4935: Merge "Move more into libadb and libadbd."
* commit 'a75b4935a4b667f0d37372db7559ecc6f8ee0b0d':
  Move more into libadb and libadbd.
2015-02-24 19:47:38 +00:00
Dan Albert
04cf174fbb am 9f3540d0: Merge "Oops. Fix make variable name. Thanks again, make."
* commit '9f3540d017f881768ec3a317d3149edd6a50fab9':
  Oops. Fix make variable name. Thanks again, make.
2015-02-24 19:47:37 +00:00
Dan Albert
4255cbd175 am 8ef39424: Merge "Ignore another stupid lint warning."
* commit '8ef39424e8ef58ea09addb4a1f3e7d1c45b30cb3':
  Ignore another stupid lint warning.
2015-02-24 19:47:35 +00:00
Dan Albert
a75b4935a4 Merge "Move more into libadb and libadbd." 2015-02-24 19:44:34 +00:00
Dan Albert
9f3540d017 Merge "Oops. Fix make variable name. Thanks again, make." 2015-02-24 19:44:12 +00:00
Dan Albert
8ef39424e8 Merge "Ignore another stupid lint warning." 2015-02-24 19:44:05 +00:00
Narayan Kamath
f6fae93164 am f9df4b13: am c40cf1ce: Merge "Remove useless refCounting from FileMap."
* commit 'f9df4b13bceb5ce85398bde843f3b0c6a88e248a':
  Remove useless refCounting from FileMap.
2015-02-24 13:04:37 +00:00
Narayan Kamath
f9df4b13bc am c40cf1ce: Merge "Remove useless refCounting from FileMap."
* commit 'c40cf1ce9d6910685bf2242c1db390af00684d9d':
  Remove useless refCounting from FileMap.
2015-02-24 12:56:45 +00:00
Narayan Kamath
c40cf1ce9d Merge "Remove useless refCounting from FileMap." 2015-02-24 12:50:54 +00:00
Mark Salyzyn
0b179b87ab am ed9b05ac: am 263b6cb6: Merge "Add more logging message and dead code"
* commit 'ed9b05acba1586dda4ad8bfb1213aa33cdf20564':
  Add more logging message and dead code
2015-02-23 22:52:55 +00:00
Mark Salyzyn
ed9b05acba am 263b6cb6: Merge "Add more logging message and dead code"
* commit '263b6cb6e3aa949a689ab532361f065a6dd3ff30':
  Add more logging message and dead code
2015-02-23 22:45:15 +00:00
Mark Salyzyn
263b6cb6e3 Merge "Add more logging message and dead code" 2015-02-23 22:38:50 +00:00
Nanik Tolaram
b627a0e2ed Add more logging message and dead code
* Add more logging message to aid in easier debugging

* Remove unnecessary dead/commented code

Change-Id: I9c7fe8f6b674cab41601001458010ab176b89776
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
2015-02-23 22:38:39 +00:00
Narayan Kamath
6832a7a4e0 Remove useless refCounting from FileMap.
Nobody ever called acquire() so release() was always
equivalent to delete. Just use delete instead so that
people can use unique_ptr directly (or shared_ptr if
they really want refcounts).

Change-Id: I9e3ad5e0f6a4fcc4e02e5a2ff7ef9514fe234415
2015-02-23 15:49:43 +00:00
Narayan Kamath
6005160b73 am d9ee5ff4: am f1ac6917: Merge "Remove loghack.h."
* commit 'd9ee5ff49f3e506361e15e397234ec1cc0ec1861':
  Remove loghack.h.
2015-02-21 10:23:33 +00:00
Narayan Kamath
d9ee5ff49f am f1ac6917: Merge "Remove loghack.h."
* commit 'f1ac6917da172dd3e6829bac41fcbf23e96da079':
  Remove loghack.h.
2015-02-21 10:15:55 +00:00
Narayan Kamath
f1ac6917da Merge "Remove loghack.h." 2015-02-21 09:51:18 +00:00
Narayan Kamath
453a332812 Remove loghack.h.
This was supposedly used to enable logging when !HAVE_ANDROID_OS
but it's only used in a file that's target specific.

Change-Id: Id83f2597e48a66b4821fc3b1237e212872b909fb
2015-02-21 09:46:31 +00:00
Dan Albert
3c43858986 Move more into libadb and libadbd.
None of this needs to be shared with minadbd, but these sources are
still needed for anything linking libadb (such as tests).

Change-Id: I3024f714da42364bf27a991986f00676e2bbbf2c
2015-02-20 17:24:30 -08:00
Dan Albert
bf10647b61 Oops. Fix make variable name. Thanks again, make.
Change-Id: Iecbb41acc835bb8eb20b668c89a3ff065470fcb7
2015-02-20 17:20:37 -08:00
Dan Albert
f1591691ee Ignore another stupid lint warning.
Change-Id: I8e586e472a139cc3039f1371f8a99935d20aa0f0
2015-02-20 17:19:22 -08:00
Narayan Kamath
0485846ab9 am 0eccc0f3: am 1158c7d5: Merge "Remove reference to NOT_USING_KLIBC and cygwin."
* commit '0eccc0f317d40504c6f6ff7ca1b9b3f185af7001':
  Remove reference to NOT_USING_KLIBC and cygwin.
2015-02-20 16:53:26 +00:00
Narayan Kamath
0eccc0f317 am 1158c7d5: Merge "Remove reference to NOT_USING_KLIBC and cygwin."
* commit '1158c7d5fe7086b42f70a81381558f35b6cd27a9':
  Remove reference to NOT_USING_KLIBC and cygwin.
2015-02-20 16:46:29 +00:00
Narayan Kamath
1158c7d5fe Merge "Remove reference to NOT_USING_KLIBC and cygwin." 2015-02-20 16:40:33 +00:00
Andreas Gampe
dc7772755e am dc941b5f: am 623eebe6: Merge "Libcutils: Remove unused variable"
* commit 'dc941b5f372d69131a8ffb9990072baa6606110f':
  Libcutils: Remove unused variable
2015-02-20 01:07:15 +00:00
Andreas Gampe
dc941b5f37 am 623eebe6: Merge "Libcutils: Remove unused variable"
* commit '623eebe68f3c6c9e54cf5b186696052d2948410c':
  Libcutils: Remove unused variable
2015-02-20 01:02:45 +00:00
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
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