Josh Gao
bad2e28bf7
Merge "base: use _NSGetExecutablePath in GetExecutablePath" am: 8e7ae1e381
...
am: d402932732
Change-Id: Ide9a5fb508594347f0c50523dab6507276292f74
2016-09-01 19:50:46 +00:00
Josh Gao
d402932732
Merge "base: use _NSGetExecutablePath in GetExecutablePath"
...
am: 8e7ae1e381
Change-Id: I1616ffbc7824cf27d880ba110d7f000d59521e6c
2016-09-01 19:47:48 +00:00
Josh Gao
8e7ae1e381
Merge "base: use _NSGetExecutablePath in GetExecutablePath"
2016-09-01 19:37:12 +00:00
Josh Gao
7307f09457
base: use _NSGetExecutablePath in GetExecutablePath
...
Bug: http://b/31240820
Change-Id: I0dbf95d3667c7ce7b474ddbb3f8e3ed69476d13e
Test: mma && adb kill-server && adb devices
2016-09-01 12:32:35 -07:00
Josh Gao
feb044f575
Merge "Add android::base::GetExecutablePath, switch adb and fastboot over." am: 945d1aaa32
...
am: 289240f0bf
Change-Id: I5a8ccc66a82b75db495c8461550339c2ec7e639e
2016-09-01 18:52:55 +00:00
Josh Gao
289240f0bf
Merge "Add android::base::GetExecutablePath, switch adb and fastboot over."
...
am: 945d1aaa32
Change-Id: I978edcc27401c174a771ab22be1a8b9abcb55d5f
2016-09-01 18:50:01 +00:00
Josh Gao
945d1aaa32
Merge "Add android::base::GetExecutablePath, switch adb and fastboot over."
2016-09-01 18:38:12 +00:00
Elliott Hughes
82ff315bb0
Add android::base::GetExecutablePath, switch adb and fastboot over.
...
We'd long had two copies of this stuff, so rather than rewrite both
Linux versions to use android::base::Readlink, let's kill the duplication
too...
Bug: http://b/30988271
Change-Id: I4de58a94a22a4b1faf969a6fc70ca1560a4d5121
2016-09-01 09:24:24 -07:00
Andreas Gampe
297f1864e1
Merge "Base: add more thread annotations" am: 3f3ea50828
...
am: 551b5b7b1e
Change-Id: I235e44243027614c29fb1cfbc01d0e28e6dacaa0
2016-08-31 22:37:25 +00:00
Andreas Gampe
551b5b7b1e
Merge "Base: add more thread annotations"
...
am: 3f3ea50828
Change-Id: Id3f14cb0e909cf8215bbc8540d9986f036d65df3
2016-08-31 22:34:26 +00:00
Treehugger Robot
3f3ea50828
Merge "Base: add more thread annotations"
2016-08-31 22:23:00 +00:00
Jorge Lucangeli Obes
ce44aa8487
Merge "Add description of 'namespace' option." am: 4588ed7b5f
...
am: 52807711fe
Change-Id: I6e770ca175fa6c4741d2d587e34086f2c084713c
2016-08-31 21:08:19 +00:00
Jorge Lucangeli Obes
52807711fe
Merge "Add description of 'namespace' option."
...
am: 4588ed7b5f
Change-Id: I43d097498527f86c72fd3748afb0e31b53591501
2016-08-31 21:05:50 +00:00
Treehugger Robot
4588ed7b5f
Merge "Add description of 'namespace' option."
2016-08-31 21:00:41 +00:00
Josh Gao
3c91e09042
Merge "base: disallow close() on unique_fd." am: ca82aa7d1e
...
am: 8c23285a85
Change-Id: Ib0a048c6792e90b8a61f4b18a50eb868f0dd671f
2016-08-31 20:56:47 +00:00
Josh Gao
8c23285a85
Merge "base: disallow close() on unique_fd."
...
am: ca82aa7d1e
Change-Id: I2caa59dad273423500da25a03dfc56592de4fafe
2016-08-31 20:53:49 +00:00
Josh Gao
ca82aa7d1e
Merge "base: disallow close() on unique_fd."
2016-08-31 20:47:13 +00:00
Daniel Rosenberg
9b1015d4ab
Merge "sdcard: Fix bad merge" am: 6a5ed849e8
...
am: 16d32620e4
Change-Id: Idf8b3d44dc7ee3600f7476d38ff68fd28fd95274
2016-08-31 20:36:17 +00:00
Daniel Rosenberg
16d32620e4
Merge "sdcard: Fix bad merge"
...
am: 6a5ed849e8
Change-Id: I6f23ba29758ca48d4f925b5f3bd4cf6f6c3b5752
2016-08-31 20:33:18 +00:00
Andreas Gampe
bc5a32e2ad
Base: add more thread annotations
...
These are taken from ART and wrap more attributes.
Test: m
Change-Id: I545fc9ab88cf9d2db4de2cb8893e2a35f6365f51
2016-08-31 13:29:07 -07:00
Treehugger Robot
6a5ed849e8
Merge "sdcard: Fix bad merge"
2016-08-31 20:26:02 +00:00
Jorge Lucangeli Obes
cd2518c19c
Add description of 'namespace' option.
...
Bug: None
Change-Id: Ib71005eb9823c7511b07d4060d08411ce3d0a8f0
2016-08-31 15:23:44 -04:00
Elliott Hughes
7d6b8b728d
Merge "Add android::base::Readlink." am: a7c4424ebc
...
am: 910799cf41
Change-Id: I243503dfb81bc21aa3b20ef87da7c55e1745e62b
2016-08-31 18:08:13 +00:00
Elliott Hughes
910799cf41
Merge "Add android::base::Readlink."
...
am: a7c4424ebc
Change-Id: Id49c69cc8aceb1ec974e58d341022dd713c9b7cb
2016-08-31 18:05:47 +00:00
Treehugger Robot
a7c4424ebc
Merge "Add android::base::Readlink."
2016-08-31 17:56:40 +00:00
Elliott Hughes
d3ff6e5231
Add android::base::Readlink.
...
Bug: http://b/30988271
Change-Id: Ib844d7c9e33465dabf7aee5e24dc3d1d8d799abd
2016-08-31 09:35:44 -07:00
Daniel Rosenberg
9526819c70
sdcard: Fix bad merge
...
A few changes got dropped along merge resolution. This adds them back
Affected CLs:
Ie188cb044be2ad87166f2d43c32a1f6b97660de0
Ibdb72ad16a1e6c3a01edcb03d003c42de7a03cd6
Change-Id: I1924f5a4bd7564ceaf9bb3a45b7fb7804b3619d7
2016-08-31 00:04:22 +00:00
Felipe Leme
3c86ebef67
Merge changes I0af0ad24,I942c92fd,Ibc8920dd,Icfce9c1e,I1c6cc616, ... am: 5b136369ca
...
am: a3dae40970
Change-Id: Ie1b5535238fa5254d2b50aaafe5c34b0595ca0fc
2016-08-30 22:58:52 +00:00
Felipe Leme
ad73b5c230
DO NOT MERGE: Split 'generating' and 'pulling' in 2 messages. am: 680f4a4888
-s ours
...
am: 24fcc797bc
-s ours
Change-Id: I2efba9bffd8a680c29dbbe192861a960faac4e55
2016-08-30 22:58:49 +00:00
Felipe Leme
95d2bfcabe
DO NOT MERGE: Ignore bugreportz output when it's not supported. am: f33fcb6418
-s ours
...
am: a524bd336e
-s ours
Change-Id: If40f0abcb549bb2757b1a84e8cada6e0c481368e
2016-08-30 22:58:46 +00:00
Felipe Leme
06dd6a87ee
DO NOT MERGE: Deprecated 'adb bugreport' with flat files. am: b3239728bb
-s ours
...
am: 91375a8e4e
-s ours
Change-Id: Icecbe08a02becf853f28ad03085e11cdfc108cd6
2016-08-30 22:58:42 +00:00
Felipe Leme
f48338b8b3
DO NOT MERGE: Minor improvements on bugreport generation. am: 6e2869680c
-s ours
...
am: c5059e1acb
-s ours
Change-Id: If3af78ac8c25bacdb63daa4679348e79e13183a1
2016-08-30 22:58:39 +00:00
Felipe Leme
1a4f8401a6
DO NOT MERGE: Removed extra 'pulling file' message. am: daf4628f36
-s ours
...
am: b63cc28a4d
-s ours
Change-Id: I3064eff8848a55ec741088009d56da40dfffb711
2016-08-30 22:58:35 +00:00
Felipe Leme
2bc2ab2896
DO NOT MERGE: Show bugreport progress. am: 6f5080faa5
-s ours
...
am: e2c9dfd13a
-s ours
Change-Id: Ib63669206e316160258b424ab3469f8be69dd7d0
2016-08-30 22:58:32 +00:00
Felipe Leme
55c2e59df7
DO NOT MERGE: Refactored functions that copy sdout and stderr to strings to use a callback. am: 0d4f0508c0
-s ours
...
am: 67e86096e3
-s ours
Change-Id: I2a25959878ef37b8a37b8f3ddaf1be53dd92cde7
2016-08-30 22:58:29 +00:00
Felipe Leme
809a7b2403
DO NOT MERGE: Split bugreport() into its own file and added unit tests. am: 698e065e14
-s ours
...
am: 53c122bbe8
-s ours
Change-Id: Id0c79c935f4eb5db0f6edfb6d536f3fc545de3e0
2016-08-30 22:58:25 +00:00
Todd Kennedy
86e2945530
DO NOT MERGE: use 'cmd' command for install-multiple am: 248722e7eb
-s ours
...
am: c8554a9a22
-s ours
Change-Id: Ib99b1252b44748cb3d8ca7a6318652d9842e2340
2016-08-30 22:58:22 +00:00
Christopher Tate
e758fd3381
DO NOT MERGE: Ensure the target sees a proper EOD marker during restore am: c42f1bb3e9
-s ours
...
am: b331588156
-s ours
Change-Id: Ic921b344bc746298d1c77956104e18a379103f31
2016-08-30 22:58:18 +00:00
Felipe Leme
a3dae40970
Merge changes I0af0ad24,I942c92fd,Ibc8920dd,Icfce9c1e,I1c6cc616, ...
...
am: 5b136369ca
Change-Id: I678f8117142c03212b3ec927e48eb6c09199844b
2016-08-30 22:55:52 +00:00
Felipe Leme
24fcc797bc
DO NOT MERGE: Split 'generating' and 'pulling' in 2 messages.
...
am: 680f4a4888
-s ours
Change-Id: Id29ad7d15cd8c2d548adaea9e4af453e3f6fbe8f
2016-08-30 22:55:51 +00:00
Felipe Leme
a524bd336e
DO NOT MERGE: Ignore bugreportz output when it's not supported.
...
am: f33fcb6418
-s ours
Change-Id: Ib32f3c8c4ccd73a1c93f0563dfd79690fdd8ff0d
2016-08-30 22:55:48 +00:00
Felipe Leme
91375a8e4e
DO NOT MERGE: Deprecated 'adb bugreport' with flat files.
...
am: b3239728bb
-s ours
Change-Id: I1a62177a57a91e89c14b5955f4946fc589f2704d
2016-08-30 22:55:44 +00:00
Felipe Leme
c5059e1acb
DO NOT MERGE: Minor improvements on bugreport generation.
...
am: 6e2869680c
-s ours
Change-Id: I1987d9d6336018566f5681523bf3d7e946d7af84
2016-08-30 22:55:41 +00:00
Felipe Leme
b63cc28a4d
DO NOT MERGE: Removed extra 'pulling file' message.
...
am: daf4628f36
-s ours
Change-Id: Idef6f24c1e590f1ffb3ccdfd2cd8679f3976dadc
2016-08-30 22:55:37 +00:00
Felipe Leme
e2c9dfd13a
DO NOT MERGE: Show bugreport progress.
...
am: 6f5080faa5
-s ours
Change-Id: I88bfa3fb03fa3e48d065cc6cb41757b33596800b
2016-08-30 22:55:34 +00:00
Felipe Leme
67e86096e3
DO NOT MERGE: Refactored functions that copy sdout and stderr to strings to use a callback.
...
am: 0d4f0508c0
-s ours
Change-Id: I4e6d14b35be89869d6853d1d4ba155823fa207e1
2016-08-30 22:55:30 +00:00
Felipe Leme
53c122bbe8
DO NOT MERGE: Split bugreport() into its own file and added unit tests.
...
am: 698e065e14
-s ours
Change-Id: Iebbdfef75e812db2d2252f50055b6df626ce05d6
2016-08-30 22:55:27 +00:00
Todd Kennedy
c8554a9a22
DO NOT MERGE: use 'cmd' command for install-multiple
...
am: 248722e7eb
-s ours
Change-Id: I4f3d38f9c6982289aada34cc3f65f47180ec2470
2016-08-30 22:55:23 +00:00
Christopher Tate
b331588156
DO NOT MERGE: Ensure the target sees a proper EOD marker during restore
...
am: c42f1bb3e9
-s ours
Change-Id: Ic2d1c391f6876a569eafe3850ceb5f048804105b
2016-08-30 22:55:19 +00:00
Treehugger Robot
5b136369ca
Merge changes I0af0ad24,I942c92fd,Ibc8920dd,Icfce9c1e,I1c6cc616, ...
...
* changes:
DO NOT MERGE: Split 'generating' and 'pulling' in 2 messages.
DO NOT MERGE: Ignore bugreportz output when it's not supported.
DO NOT MERGE: Deprecated 'adb bugreport' with flat files.
DO NOT MERGE: Minor improvements on bugreport generation.
DO NOT MERGE: Removed extra 'pulling file' message.
DO NOT MERGE: Show bugreport progress.
DO NOT MERGE: Refactored functions that copy sdout and stderr to strings to use a callback.
DO NOT MERGE: Split bugreport() into its own file and added unit tests.
DO NOT MERGE: use 'cmd' command for install-multiple
DO NOT MERGE: Ensure the target sees a proper EOD marker during restore
2016-08-30 22:46:17 +00:00