Elliott Hughes
0beef09b1c
am 58b81bf8: am a82f2b25: Merge "Support "fastboot reboot bootloader"."
...
* commit '58b81bf81b2fc67cffe5908a38291f32256a0ea2':
Support "fastboot reboot bootloader".
2015-02-25 18:50:40 +00:00
Dan Albert
b5cec1ea5c
am 3b7ccba7: am 186a38bc: am d75d6c91: Merge "Fix the mac build."
...
* commit '3b7ccba743db3a8922658f728232f9584b40ff83':
Fix the mac build.
2015-02-25 18:47:40 +00:00
Elliott Hughes
58b81bf81b
am a82f2b25: Merge "Support "fastboot reboot bootloader"."
...
* commit 'a82f2b259076135017a2665bfbc3344826e9112f':
Support "fastboot reboot bootloader".
2015-02-25 18:47:07 +00:00
Elliott Hughes
a82f2b2590
Merge "Support "fastboot reboot bootloader"."
2015-02-25 18:43:04 +00:00
Dan Albert
3b7ccba743
am 186a38bc: am d75d6c91: Merge "Fix the mac build."
...
* commit '186a38bc7be031af7211dd9a4ecbd071a573fd9a':
Fix the mac build.
2015-02-25 18:40:55 +00:00
Dan Albert
186a38bc7b
am d75d6c91: Merge "Fix the mac build."
...
* commit 'd75d6c91d24c071534ed36db85a1e72b33dc5a10':
Fix the mac build.
2015-02-25 18:34:26 +00:00
Dan Albert
d75d6c91d2
Merge "Fix the mac build."
2015-02-25 18:27:41 +00:00
Dan Albert
dc0f8ecb24
Fix the mac build.
...
Change-Id: Ieb6f2650ce5f39f1d8c938d0ca8cbec459d8e2fd
2015-02-25 10:26:17 -08:00
Mark Salyzyn
581a20b8ed
am ac947104: am f5579498: am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
...
* commit 'ac9471041e5c2d2903ce6470a35ba5b3baf80aa0':
liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:24:17 +00:00
Mark Salyzyn
ac9471041e
am f5579498: am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
...
* commit 'f5579498d93e1ba56aaf23765f3693dfddab8599':
liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:16:47 +00:00
Mark Salyzyn
f5579498d9
am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
...
* commit '110166c1dbcbe26e510ac3fdaf2e1fcc7efbcc4e':
liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:12:48 +00:00
Mark Salyzyn
110166c1db
Merge "liblog: introduce ANDROID_LOG_* flags"
2015-02-25 18:07:02 +00:00
Elliott Hughes
ca85df0662
Support "fastboot reboot bootloader".
...
This matches the more general adb syntax, though the fastboot
protocol doesn't support rebooting into the recovery image.
Change-Id: I6d93d4c63d4a9b81c71e681e7a7bf76867fba019
2015-02-25 10:02:00 -08:00
Mark Salyzyn
2d3f38a6b8
liblog: introduce ANDROID_LOG_* flags
...
Move away from using POSIX open(2) flags and introduce ANDROID_LOG_* flags to
replace them. Add security by preventing random mode flags from getting into
underlying POSIX calls. ANDROID_LOG_* flags overlap POSIX O_* flag definitions.
Change-Id: Ib32bb64c287e8bf150be62242e1ba46bb37839fc
2015-02-25 17:44:18 +00:00
Dan Albert
533d53fb44
am 5127e557: am 16f3d361: am 72bf2a71: Merge "Move transport declarations into transport.h."
...
* commit '5127e55718ef3bcdd239ef6c4e2af8ac48844317':
Move transport declarations into transport.h.
2015-02-25 17:00:00 +00:00
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
5127e55718
am 16f3d361: am 72bf2a71: Merge "Move transport declarations into transport.h."
...
* commit '16f3d361e12e423d56697f59bd0c61f8597798e8':
Move transport declarations into transport.h.
2015-02-25 16:52:52 +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
16f3d361e1
am 72bf2a71: Merge "Move transport declarations into transport.h."
...
* commit '72bf2a710089b5fff42059d5946fe7bdd6b12480':
Move transport declarations into transport.h.
2015-02-25 05:38:53 +00:00
Dan Albert
72bf2a7100
Merge "Move transport declarations into transport.h."
2015-02-25 05:33:35 +00:00
Dan Albert
7664901a35
Move transport declarations into transport.h.
...
There are a few cloexec issues in here as an added bonus.
Change-Id: I1699d719d733f47878bdba0454230cf5ab6a60b6
2015-02-24 21:30:22 -08: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