Commit graph

23917 commits

Author SHA1 Message Date
Elliott Hughes
762dcdb110 Merge \\\"Lose log to toybox.\\\" am: cfdd57eed8 am: a247e9ad47
am: e7130d28c7

Change-Id: Id9d1efbce9595603364149c32222445eb684fd43
2016-06-22 21:47:26 +00:00
Elliott Hughes
e7130d28c7 Merge \\"Lose log to toybox.\\" am: cfdd57eed8
am: a247e9ad47

Change-Id: Iec95d39df39df705f0d6b5bb90e268330cabf031
2016-06-22 21:43:35 +00:00
Elliott Hughes
a247e9ad47 Merge \"Lose log to toybox.\"
am: cfdd57eed8

Change-Id: I553d1445cc98eedc07ec091e1a3ac7196f786446
2016-06-22 21:41:03 +00:00
Treehugger Robot
cfdd57eed8 Merge "Lose log to toybox." 2016-06-22 21:35:50 +00:00
Christopher Ferris
38c66fc869 Merge \\\"Add support to indicate bitness of public library.\\\" am: 3fb358478f am: 1b4f54e878
am: 6527fa00f7

Change-Id: Ib6997c588d034a8e232ffde92b6d056e735204b5
2016-06-22 19:42:48 +00:00
Christopher Ferris
6527fa00f7 Merge \\"Add support to indicate bitness of public library.\\" am: 3fb358478f
am: 1b4f54e878

Change-Id: I300bb0bad0f22e0b535e04e3da5bac3872769597
2016-06-22 19:40:11 +00:00
Christopher Ferris
1b4f54e878 Merge \"Add support to indicate bitness of public library.\"
am: 3fb358478f

Change-Id: Ia5a7580cb26dbafa5863ae5d85aaaccb62936921
2016-06-22 19:37:31 +00:00
Elliott Hughes
cf75c1bf14 Lose log to toybox.
Change-Id: I42d792e79ed51fcc3c89f77d039d39417ead03c3
2016-06-22 12:33:33 -07:00
Treehugger Robot
3fb358478f Merge "Add support to indicate bitness of public library." 2016-06-22 19:26:51 +00:00
Android Build Merger (Role)
a1ddb6f5e7 Merge "DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd am: 31fc3c3be6" into nyc-mr1-dev-plus-aosp 2016-06-22 18:39:16 +00:00
Josh Gao
9108fcb5c8 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd
am: 31fc3c3be6

Change-Id: I0cbb566020727491a08f6915080d1d075d5fbc5e
2016-06-22 18:39:09 +00:00
Josh Gao
72d927d4e3 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd
am: a2884315f4

Change-Id: Ifd419089d87471231055d38493d104d4226d0457
2016-06-22 18:39:03 +00:00
Josh Gao
a2884315f4 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours
am: 2dff6490fd

Change-Id: Ibae7110f3e755d504771227c23cd3615c3984b80
2016-06-22 18:36:36 +00:00
Josh Gao
31fc3c3be6 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours
am: 2dff6490fd

Change-Id: Ia46affe450d4189f1ac77ed8024452394f065468
2016-06-22 18:36:31 +00:00
Josh Gao
2dff6490fd DO NOT MERGE: adb: use asocket\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16
am: 46104a0d79  -s ours

Change-Id: If33739a6317a8ad6f008960a5726dc6e2ce7c18c
2016-06-22 18:33:53 +00:00
Josh Gao
f6410763ae DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours am: 2a9f4e1c50
am: 3d93063c14

Change-Id: Ic614220ad27d3acac4df2d2b0a06e82b888ebcbb
2016-06-22 18:31:32 +00:00
Josh Gao
46104a0d79 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376
am: 755ab3ed16

Change-Id: I43718396c291ac9cb261097f7a34cfa7c1fa3725
2016-06-22 18:31:11 +00:00
Josh Gao
3d93063c14 DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours
am: 2a9f4e1c50

Change-Id: Ifa8c4e19405a574e99704cab576ac9db5921202d
2016-06-22 18:28:43 +00:00
Josh Gao
bfbee14c49 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours am: 2a9f4e1c50
am: 9d35b1e07e

Change-Id: Ief0172fe11950cc1d0fe1c97803af36f9f866e2f
2016-06-22 18:28:43 +00:00
Josh Gao
755ab3ed16 DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186
am: 57f5c95376

Change-Id: Ib68980c2897ba668691c76989375a5382bc8af3f
2016-06-22 18:26:13 +00:00
Josh Gao
9d35b1e07e DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours
am: 2a9f4e1c50

Change-Id: Ib8bcf35186fd28c506bd3d269fd90dfb76556bf2
2016-06-22 18:26:12 +00:00
Josh Gao
2a9f4e1c50 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3
am: 96dea5690a  -s ours

Change-Id: Icef5dce2b992030b3cee1269e2e46992bd063537
2016-06-22 18:23:51 +00:00
Josh Gao
57f5c95376 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours
am: d389f5d186

Change-Id: I5c106da4673571bc24e17742ab62960333507f77
2016-06-22 18:23:41 +00:00
Josh Gao
d389f5d186 DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219
am: fdf3112207  -s ours

Change-Id: I42711a1a41b8099df1b769eb1c4e1fbbd2ee78bf
2016-06-22 18:21:33 +00:00
Christopher Ferris
39da84b06c Add support to indicate bitness of public library.
For public vendor libraries, a vendor might have only a 32 bit
or only a 64 bit version of the library. Add a way to indicate this
in the public.libraries.txt files. The new format is:

  library.so 32

This indicates that this is a 32 bit only public library.

  library.so 64

This indicates that this is a 64 bit only public library.

Bug: 29370721
Bug: 29512261
(cherry picked from commit 6664a805ca)

Change-Id: Id52c8b61d5c802ce62edda7e25f2755f6f93d6b7
2016-06-22 11:21:21 -07:00
Josh Gao
96dea5690a DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31
am: 57b4b422e3

Change-Id: I14d98d1df800f6197c5eb28a45bd9fe259c844bf
2016-06-22 18:21:11 +00:00
Josh Gao
fdf3112207 DO NOT MERGE: adb: use asocket\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411
am: dc6e14f219

Change-Id: Iac5c5b2bb07505cde1638f42d5e1ae6566a88c0b
2016-06-22 18:19:09 +00:00
Josh Gao
57b4b422e3 DO NOT MERGE: adb: use asocket\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e
am: d99c745c31

Change-Id: I1b615a3910580ae7f78b038b18b969c196fabe1e
2016-06-22 18:18:37 +00:00
Josh Gao
dc6e14f219 DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours
am: fb9747c411

Change-Id: Ife4804a27b044aebaaefda6626adb61c241812af
2016-06-22 18:16:21 +00:00
Josh Gao
d99c745c31 DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours
am: f5592e174e

Change-Id: Ib220d4a778ea4e7bda44aafbbaa4911c243d7db7
2016-06-22 18:15:59 +00:00
Josh Gao
fb9747c411 DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours
am: 45a4bca09d  -s ours

Change-Id: I2124ed25893de9910be435ba68619dfc00e66239
2016-06-22 18:11:44 +00:00
Josh Gao
f5592e174e DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534
am: 8ec6f5b46f  -s ours

Change-Id: If7256035b8844a6567080b5caf769a0a4f567d2f
2016-06-22 18:11:17 +00:00
Josh Gao
45a4bca09d DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999
am: a3d96cfec9  -s ours

Change-Id: I4ca0f2890519c3450a15edab989ca424b6bb10ae
2016-06-22 18:07:24 +00:00
Josh Gao
8ec6f5b46f DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f
am: 05d5db2534

Change-Id: I433e885416a6cbf93bc701cfebc046f78a7af7dd
2016-06-22 18:07:06 +00:00
Josh Gao
a3d96cfec9 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 5218ad36ad
am: d7e24ec999

Change-Id: I9ca9e7e857de9e9679169cd7239f9e54a3d98dd2
2016-06-22 18:02:25 +00:00
Josh Gao
05d5db2534 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 83cb3032d2 -s ours
am: 420aa30c9f

Change-Id: I779b0b79ce268561f4a686d6e98c131707464ecf
2016-06-22 18:01:40 +00:00
Christopher Ferris
65d2b14403 Merge \"Add support to indicate bitness of public library.\" into nyc-mr1-dev
am: 3394cd7c3c

Change-Id: Id467cc352f61c744346808af0dcc670edbcc1501
2016-06-22 18:01:26 +00:00
Josh Gao
d7e24ec999 DO NOT MERGE: adb: use asocket\'s close function when closing.
am: 5218ad36ad

Change-Id: Ibc9ee3b566d34847f4e1e02413890449750ba2f5
2016-06-22 17:59:18 +00:00
Josh Gao
420aa30c9f DO NOT MERGE: adb: use asocket\'s close function when closing.
am: 83cb3032d2  -s ours

Change-Id: I357c754fe2bc3fdf4f050c26aace2bea4c6569c2
2016-06-22 17:58:51 +00:00
Christopher Ferris
3394cd7c3c Merge "Add support to indicate bitness of public library." into nyc-mr1-dev 2016-06-22 17:56:50 +00:00
Elliott Hughes
72593e4c77 Merge \\\"Address old review comments in adb_auth_host.cpp.\\\" am: 57bbedc036 am: a81117b8f9
am: e8d4b42ffa

Change-Id: I333dd8d877c5f3dc5c50c6225c055e5982a673eb
2016-06-22 17:31:22 +00:00
Elliott Hughes
e8d4b42ffa Merge \\"Address old review comments in adb_auth_host.cpp.\\" am: 57bbedc036
am: a81117b8f9

Change-Id: I3c06cce473ef441c632ae1d3b6c2fbb7cd0679ae
2016-06-22 17:21:16 +00:00
Elliott Hughes
a81117b8f9 Merge \"Address old review comments in adb_auth_host.cpp.\"
am: 57bbedc036

Change-Id: I0ab20c9258d42e6b0b847e8eb69382005f086706
2016-06-22 17:17:51 +00:00
Treehugger Robot
57bbedc036 Merge "Address old review comments in adb_auth_host.cpp." 2016-06-22 17:09:26 +00:00
Elliott Hughes
625faf0196 Address old review comments in adb_auth_host.cpp.
Comments from:
https://android-review.googlesource.com/#/c/212781/4/adb/adb_auth_host.cpp@107

Bug: http://b/28152031
Change-Id: I27d062f3eeb8db90f94b1b4f5d7204000a7ac73d
Test: manually removed ~/.android/adb* and checked they were recreated correctly.
2016-06-22 08:38:47 -07:00
Elliott Hughes
885dfcb509 Merge \\\"Add timestamps to libbase\\\'s stderr logging.\\\" am: 55d20a7632 am: dc1c4261f4
am: 43c2aea0ca

Change-Id: I3b0d2e41a49499b0405ffd4b56ade3eed2f738ac
2016-06-22 15:37:41 +00:00
Elliott Hughes
43c2aea0ca Merge \\"Add timestamps to libbase\\'s stderr logging.\\" am: 55d20a7632
am: dc1c4261f4

Change-Id: I18a9c1b10450cfee9531091be4c18a2484c9a2cd
2016-06-22 15:34:39 +00:00
Elliott Hughes
dc1c4261f4 Merge \"Add timestamps to libbase\'s stderr logging.\"
am: 55d20a7632

Change-Id: Ia53ca3012594e57d2df6068314d0b2cfb99bd1dc
2016-06-22 15:31:56 +00:00
Elliott Hughes
55d20a7632 Merge "Add timestamps to libbase's stderr logging." 2016-06-22 15:27:51 +00:00
David 'Digit' Turner
717400c455 Merge \\\"Remove qemu_tracing dependency.\\\" am: ed5fd6fd5c am: 23b9da5fce
am: 6ab5cc6336

Change-Id: If9dcbc968b4fba717bd9acffadb5f30349a5a546
2016-06-22 08:17:56 +00:00