Commit graph

12685 commits

Author SHA1 Message Date
Dan Albert
f61d2c1935 am 1ed23507: am 01eed218: am f5f9dd57: Merge "Add .clang-format file."
* commit '1ed23507f751d0d9c6636b6b5f179fd85fd65266':
  Add .clang-format file.
2015-02-25 16:59:57 +00:00
Dan Albert
57d4744f74 am 5caa1907: am 290a6b33: am 5329d3fd: Merge "Add a project wide clang switch."
* commit '5caa19077ab32c7ba58c345e1c57bfa1c38abdfb':
  Add a project wide clang switch.
2015-02-25 16:59:55 +00:00
Elliott Hughes
1ec46c5e2c am 85497fb9: am 47b0946b: am 70385f30: Merge "Remove the emulator special case from the "adb root" code."
* commit '85497fb9148e498b5f4123b6fb68dd712ee3f0d5':
  Remove the emulator special case from the "adb root" code.
2015-02-25 16:59:54 +00:00
Dan Albert
588436007c am 292a9c12: am e780a43e: am 17f26790: Merge "Make Python tests only check the current device."
* commit '292a9c12a3d1bc9155652d232fd6aade7277c7de':
  Make Python tests only check the current device.
2015-02-25 16:59:53 +00:00
Mark Salyzyn
0a20f28945 am 4bb4e626: am cd9ea7ad: am 5526a897: Merge "init: grab-bootchart.sh: run bootchart and display results"
* commit '4bb4e626c30e64142a49593e82d0391f179ffd64':
  init: grab-bootchart.sh: run bootchart and display results
2015-02-25 16:59:51 +00:00
Dan Albert
e022bed7e2 am 01ba7582: am 2c504467: am d6e9a1f5: Merge "Fix Mac build."
* commit '01ba75828232da74cc066df5376812f3387676b9':
  Fix Mac build.
2015-02-25 16:59:50 +00:00
Dan Albert
d302d84cc5 am 7998e6c5: am 4868ec8c: am a63b7d59: Merge "Fix Windows SDK build."
* commit '7998e6c50f94486d4ac9bb268d73a73c6eb5d592':
  Fix Windows SDK build.
2015-02-25 16:59:49 +00:00
Elliott Hughes
cd7fc17698 am 34af320e: am aaa61ab9: am db3a5d98: Merge "Add missing <stdlib.h> to adb_listeners.c."
* commit '34af320ed70c67077c43929bf177afa02d59d11a':
  Add missing <stdlib.h> to adb_listeners.c.
2015-02-25 16:59:46 +00:00
Dan Albert
677ff6b162 am 7fe1e6c3: am a1e60d68: am a75b4935: Merge "Move more into libadb and libadbd."
* commit '7fe1e6c3e54cf90617bab9f6ea0432254dccef74':
  Move more into libadb and libadbd.
2015-02-25 16:59:45 +00:00
Dan Albert
1f9861d3b7 am 50e53669: am 04cf174f: am 9f3540d0: Merge "Oops. Fix make variable name. Thanks again, make."
* commit '50e536691d34ddd277bd7d73086346fdf3a5bea5':
  Oops. Fix make variable name. Thanks again, make.
2015-02-25 16:59:43 +00:00
Dan Albert
97708e0494 am a130ddf7: am 4255cbd1: am 8ef39424: Merge "Ignore another stupid lint warning."
* commit 'a130ddf763e526986a60bf5c69c6adaa15b50225':
  Ignore another stupid lint warning.
2015-02-25 16:59:42 +00:00
Dan Albert
1ed23507f7 am 01eed218: am f5f9dd57: Merge "Add .clang-format file."
* commit '01eed2187cf834d31332e9611f3e4fe86eb7c715':
  Add .clang-format file.
2015-02-25 16:52:46 +00:00
Dan Albert
5caa19077a am 290a6b33: am 5329d3fd: Merge "Add a project wide clang switch."
* commit '290a6b33d7087e833c8d023533728c08153e35b5':
  Add a project wide clang switch.
2015-02-25 16:52:40 +00:00
Elliott Hughes
85497fb914 am 47b0946b: am 70385f30: Merge "Remove the emulator special case from the "adb root" code."
* commit '47b0946bce6c576667d539281b271104c6018480':
  Remove the emulator special case from the "adb root" code.
2015-02-25 16:52:38 +00:00
Dan Albert
292a9c12a3 am e780a43e: am 17f26790: Merge "Make Python tests only check the current device."
* commit 'e780a43eed3fb53daeb5937bf590263a0ae592ef':
  Make Python tests only check the current device.
2015-02-25 16:52:30 +00:00
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
Dan Albert
01eed2187c am f5f9dd57: Merge "Add .clang-format file."
* commit 'f5f9dd572164d1b9cbd80b1b29cd8c42806ac715':
  Add .clang-format file.
2015-02-25 02:11:51 +00:00
Dan Albert
f5f9dd5721 Merge "Add .clang-format file." 2015-02-25 02:06:15 +00:00
Dan Albert
103c1be03f Add .clang-format file.
Not going to format the whole world just yet, but this helps for `git
clang-format`.

Change-Id: I482819419647e4c752d3b044bde8d637e1fae1e5
2015-02-24 16:56:39 -08:00
Dan Albert
290a6b33d7 am 5329d3fd: Merge "Add a project wide clang switch."
* commit '5329d3fd54fa875bb7de78a8c40134cc63921c64':
  Add a project wide clang switch.
2015-02-25 00:25:22 +00:00
Dan Albert
5329d3fd54 Merge "Add a project wide clang switch." 2015-02-25 00:20:39 +00:00
Elliott Hughes
47b0946bce am 70385f30: Merge "Remove the emulator special case from the "adb root" code."
* commit '70385f3017366ecf06af7a073a2fb955e93d01ba':
  Remove the emulator special case from the "adb root" code.
2015-02-25 00:00:39 +00:00
Dan Albert
9697ce520d Add a project wide clang switch.
I'll probably make this the default soon, but I'm not brave enough to
do that without checking the recovery image first.

Change-Id: I9cde687b08a588e3797645a308f381e4ec553447
2015-02-24 15:54:34 -08:00
Elliott Hughes
70385f3017 Merge "Remove the emulator special case from the "adb root" code." 2015-02-24 23:53:55 +00:00
Dan Albert
e780a43eed am 17f26790: Merge "Make Python tests only check the current device."
* commit '17f267905b6be932e1ff1559d84a5517e6b4b803':
  Make Python tests only check the current device.
2015-02-24 22:50:31 +00:00
Dan Albert
17f267905b Merge "Make Python tests only check the current device." 2015-02-24 22:45:08 +00:00
Dan Albert
b2e57b738f Make Python tests only check the current device.
In practice testing all connected devices is a pain, since it's
probably each device is running a different build. It would probably
make sense to just move this functionality up into a higher level test
runner (which could just live in main).

Also rename test_devices to test_shell, since it doesn't really test
`adb devices`.

Change-Id: Ie96d3e83b30acfac4e3bcbd9821690c0ad4d2f7e
2015-02-24 14:36:03 -08: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
Elliott Hughes
abd6773b41 Remove the emulator special case from the "adb root" code.
The emulator is essential an "eng" build, so the regular properties
should suffice.

Change-Id: Id63b3918f9b0b04b0d887ed886535b9976a9cc85
2015-02-24 14:10:51 -08: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
Todd Poynor
74d0b58cb9 Merge "Fix print format mismatch in 64-bit mode." 2015-02-24 20:42:58 +00: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