Daniel Rosenberg
4c13769dba
am 24e834ab: am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
...
* commit '24e834ab6037cee0d3e8569d5fd45695f86865bd':
fastboot: Remove tos from flashall
2014-09-16 21:46:37 +00:00
Esteban de la Canal
4a3ed65549
am 6565e612: am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
...
* commit '6565e61226a3cefe59c4cb417490c8b6c2309ab0':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-16 21:46:37 +00:00
Daniel Rosenberg
24e834ab60
am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
...
* commit '81b857f3a21f3ae96a5ec72e54982fe30278049f':
fastboot: Remove tos from flashall
2014-09-16 21:34:45 +00:00
Esteban de la Canal
6565e61226
am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
...
* commit 'a5ab96eb50f27989240ab8917e8ebf3a028bcdfb':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-16 21:34:34 +00:00
Daniel Rosenberg
81b857f3a2
Merge "fastboot: Remove tos from flashall" into lmp-dev
2014-09-16 20:08:01 +00:00
Kenny Root
bf222de3dd
am 3e5e615f: am 46679c1d: am 8d35442b: Merge "fix windows build"
...
* commit '3e5e615f75ec08b9c6522e552ea98c0615146924':
fix windows build
2014-09-16 19:57:03 +00:00
Kenny Root
ebf75d8b21
am 2173582b: resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp
...
* commit '2173582b5ab0bdda79c2f4ba784fe2fe12eaa7eb':
adb: fix 64-bit build
add sideload-host mode to adb
2014-09-16 19:57:02 +00:00
Christopher Ferris
f9252d49cd
am 9d859fee: am f37bfb32: am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
...
* commit '9d859fee5ebd5eda19c3a1c4e1c320903c679d43':
Use the correct fuse_init_out structure size.
2014-09-16 19:57:01 +00:00
Mark Salyzyn
3ab617e013
am 0537416d: am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
...
* commit '0537416da52e1ec2da4b4c1bf1270893cddd6a60':
logcat: -v format defaults to threadtime
2014-09-16 19:57:00 +00:00
Kenny Root
3e5e615f75
am 46679c1d: am 8d35442b: Merge "fix windows build"
...
* commit '46679c1dce8dff027e1f87acb9bcfc81c0613721':
fix windows build
2014-09-16 19:53:07 +00:00
Kenny Root
2173582b5a
resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp
...
Change-Id: I1c29b6cbed8a012f271c16b4875b954d2bddf648
2014-09-16 12:46:38 -07:00
Christopher Ferris
9d859fee5e
am f37bfb32: am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
...
* commit 'f37bfb32eb82393d14e339684c9f508cea3b0ab4':
Use the correct fuse_init_out structure size.
2014-09-16 19:42:53 +00:00
Mark Salyzyn
0537416da5
am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
...
* commit 'a9d789dd8a7c1cfe58793d77af80bb457fca3cf2':
logcat: -v format defaults to threadtime
2014-09-16 19:42:53 +00:00
Kenny Root
46679c1dce
am 8d35442b: Merge "fix windows build"
...
* commit '8d35442b18e9dddfdde89c81e0cc910c70a12202':
fix windows build
2014-09-16 18:12:06 +00:00
Kenny Root
8d35442b18
Merge "fix windows build"
2014-09-16 18:00:47 +00:00
Doug Zongker
edda73d0c8
fix windows build
...
(cherry-picked from commit 4b39c6aca9
2014-09-16 10:59:49 -07:00
Kenny Root
d9714d344c
am d372c5c3: Merge changes I11e84a7b,I5adaedd8
...
* commit 'd372c5c36510b99254b031d3fd5958e246a85544':
adb: fix 64-bit build
add sideload-host mode to adb
2014-09-16 17:39:39 +00:00
Christopher Ferris
f37bfb32eb
am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
...
* commit '23aeeff510b2962c127f9dc4ab4eb8cf564880c5':
Use the correct fuse_init_out structure size.
2014-09-16 17:39:38 +00:00
Kenny Root
d372c5c365
Merge changes I11e84a7b,I5adaedd8
...
* changes:
adb: fix 64-bit build
add sideload-host mode to adb
2014-09-16 17:36:13 +00:00
Colin Cross
52e0b61999
adb: fix 64-bit build
...
strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.
(cherry-picked from commit 6d6a898b0c
2014-09-16 10:31:30 -07:00
Christopher Ferris
23aeeff510
Merge "Use the correct fuse_init_out structure size."
2014-09-16 17:29:20 +00:00
Doug Zongker
8e49ae4bb8
add sideload-host mode to adb
...
The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer. It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.
If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.
(cherry-picked from commit 71fe584a1a
2014-09-16 10:27:38 -07:00
Mark Salyzyn
a9d789dd8a
am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
...
* commit 'a3e53f1dfe2686e6f0bad75a587f779d955427b3':
logcat: -v format defaults to threadtime
2014-09-16 17:06:00 +00:00
Mark Salyzyn
a3e53f1dfe
Merge "logcat: -v format defaults to threadtime"
2014-09-16 16:53:39 +00:00
Mark Salyzyn
649fc605f8
logcat: -v format defaults to threadtime
...
Change-Id: Iafddf83b0507a667e0395d38ec9afaed67319018
2014-09-16 09:27:37 -07:00
Christopher Ferris
ff649ea5ab
Use the correct fuse_init_out structure size.
...
Kernel 2.6.16 is the first stable kernel with struct fuse_init_out
defined (fuse version 7.6). The structure is the same from 7.6 through
7.22. Beginning with 7.23, the structure increased in size and added
new parameters.
If the kernel only works on minor revs older than or equal to 22,
then use the older structure size since this code only uses the 7.22
version of the structure.
Change-Id: If2507a02ad674fcf02869a325221339ae1ace64d
2014-09-15 18:29:47 -07:00
Esteban de la Canal
a5ab96eb50
74602: Fixes adb not seeing connected devices on Mac.
...
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html
Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-15 15:46:13 -07:00
Daniel Rosenberg
015d73ff4e
fastboot: Remove tos from flashall
...
bug: 17498561
Change-Id: I0190c1a5ac635375404799c040e4be523fa29622
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-09-15 13:44:07 -07:00
Christopher Ferris
1b31f48903
am 01401bbc: am f253fd07: am 17077a28: Merge "Use the correct debuggerd given the tid."
...
* commit '01401bbc37fd208ddd223a830b79391c05183b42':
Use the correct debuggerd given the tid.
2014-09-14 00:50:10 +00:00
Christopher Ferris
01401bbc37
am f253fd07: am 17077a28: Merge "Use the correct debuggerd given the tid."
...
* commit 'f253fd079b0768e8c90a616d6dda47652ca4f646':
Use the correct debuggerd given the tid.
2014-09-14 00:34:40 +00:00
Christopher Ferris
f253fd079b
am 17077a28: Merge "Use the correct debuggerd given the tid."
...
* commit '17077a287c2260a35ea99e19b0308e479edc6cbb':
Use the correct debuggerd given the tid.
2014-09-14 00:26:34 +00:00
Christopher Ferris
17077a287c
Merge "Use the correct debuggerd given the tid."
2014-09-14 00:15:27 +00:00
Christopher Ferris
6bcc4acc6f
Use the correct debuggerd given the tid.
...
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.
This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.
Bug: 17487122
(cherry picked from commit a9fa7b87f1
2014-09-13 16:22:17 -07:00
Christopher Ferris
95b6824052
am 07bb3f1e: am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
...
* commit '07bb3f1e0b86199b3a62dd0d4a5f24c6dab70c65':
Use the correct debuggerd given the tid.
2014-09-13 23:02:07 +00:00
Christopher Ferris
07bb3f1e0b
am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
...
* commit '07dda6b57c6a476177b68ad42966f24cbbdb04c1':
Use the correct debuggerd given the tid.
2014-09-13 22:54:00 +00:00
Christopher Ferris
07dda6b57c
Merge "Use the correct debuggerd given the tid." into lmp-dev
2014-09-13 22:31:55 +00:00
Christopher Ferris
a9fa7b87f1
Use the correct debuggerd given the tid.
...
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.
This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.
Bug: 17487122
Change-Id: Icf123a6f4508b1aeec073663aa1a0ceae5380aa1
2014-09-12 20:12:11 -07:00
Chih-Hung Hsieh
ff3a17c8cd
am bb7f515a: am b51e3dbd: am 6e9798f2: Merge "logd: fix format-extra-args warning."
...
* commit 'bb7f515ad3d3d25a0b93978b251bc9005eec848a':
logd: fix format-extra-args warning.
2014-09-13 02:28:02 +00:00
Esteban de la Canal
4b22ed37ab
am da5b2d67: am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
...
* commit 'da5b2d67faeb2a85f042cf5b23d9875ad3413183':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-13 02:25:15 +00:00
Dan Albert
05337da304
am fb1b6dac: am 522c1d34: am e18ed89e: Merge "Remove makefile cruft."
...
* commit 'fb1b6daca82f25e2f40164c1b7cd9f3c6e36737c':
Remove makefile cruft.
2014-09-13 02:23:15 +00:00
Dmitriy Ivanov
b30a15b954
am c8b4bb06: am 209dc083: am 870cac61: Merge "Add -std=gnu++11 to test cflags"
...
* commit 'c8b4bb0660637a2d99554d95a2bd71722e705a36':
Add -std=gnu++11 to test cflags
2014-09-13 02:23:14 +00:00
Elliott Hughes
5652686b6a
am 8ac097a0: am e4bf208c: am 082a52b5: Merge "Move libutils over to pthread_gettid_np."
...
* commit '8ac097a036d043a932d6159141cd05dc6066abfd':
Move libutils over to pthread_gettid_np.
2014-09-13 02:23:13 +00:00
Mark Salyzyn
af085c533b
am abc75368: am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output."
...
* commit 'abc75368a892bf2fa973a19e439e1b565c753ce2':
liblog: logcat: colored output.
2014-09-13 02:23:12 +00:00
Paul Lawrence
04521e05eb
am fdf93c06: am cf234dc7: Preserve errno from fsmgr_do_mount
...
* commit 'fdf93c06317f6d63e72aa1105777a248b9679e84':
Preserve errno from fsmgr_do_mount
2014-09-13 02:21:44 +00:00
Chih-Hung Hsieh
bb7f515ad3
am b51e3dbd: am 6e9798f2: Merge "logd: fix format-extra-args warning."
...
* commit 'b51e3dbdd8d95f595c70dd244b5f2f4f23ef20cd':
logd: fix format-extra-args warning.
2014-09-13 00:42:14 +00:00
Chih-Hung Hsieh
b51e3dbdd8
am 6e9798f2: Merge "logd: fix format-extra-args warning."
...
* commit '6e9798f2e44c82b0cd8257f96b7d23285a7edc67':
logd: fix format-extra-args warning.
2014-09-13 00:24:57 +00:00
Chih-Hung Hsieh
6e9798f2e4
Merge "logd: fix format-extra-args warning."
2014-09-13 00:15:30 +00:00
Chih-Hung Hsieh
634118e261
logd: fix format-extra-args warning.
...
Bug: 17409250
Change-Id: Id50ebb57754b12d69ed605d0e2901b8e05c607c6
2014-09-12 23:37:42 +00:00
Esteban de la Canal
da5b2d67fa
am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
...
* commit '99bb69c1cee678382bf5e48962aa444469b3310e':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-12 21:43:43 +00:00
Esteban de la Canal
99bb69c1ce
am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
...
* commit 'f41ee3d5a1f236b0770d1ebd7068606aea7288bd':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-12 21:26:49 +00:00
