Treehugger Robot
b42e4a6b63
Merge "Kill load_file."
2016-05-28 00:17:10 +00:00
Yurii Zubrytskyi
e5635175ab
Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4
...
am: 979998b965
2016-05-27 23:21:49 +00:00
Elliott Hughes
e8b663fec3
Kill load_file.
...
Change-Id: I6c332f7d8e94d513605295b3d4d32c4e1cf878dc
2016-05-27 16:14:02 -07:00
Yurii Zubrytskyi
979998b965
Merge "[adb] Followup CL to clean up adb_auth_host.cpp"
...
am: 9c7f9215e4
2016-05-27 23:13:04 +00:00
Treehugger Robot
9c7f9215e4
Merge "[adb] Followup CL to clean up adb_auth_host.cpp"
2016-05-27 23:08:06 +00:00
Chih-Hung Hsieh
5fb629a212
resolve merge conflicts of e845c04 to nyc-dev-plus-aosp
...
Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6
2016-05-27 16:04:21 -07:00
Chih-Hung Hsieh
e845c04f12
Merge "Fix misc-macro-parentheses warnings in init and other core modules."
...
am: ac080d2128
2016-05-27 22:55:22 +00:00
Chih-hung Hsieh
ac080d2128
Merge "Fix misc-macro-parentheses warnings in init and other core modules."
2016-05-27 22:44:15 +00:00
Elliott Hughes
70ca8dcb0b
resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp
...
Change-Id: Id8d69ba8c0e04e6772c8b9a6318380de26d47b2a
2016-05-27 14:50:58 -07:00
Yurii Zubrytskyi
dace015269
[adb] Followup CL to clean up adb_auth_host.cpp
...
Get rid of unused includes + replace a fixed-size buffer with an
std::string
(cherry-pick of 049ebb810f466d916ec9e73cdf28624b57a8c25d.)
Change-Id: I4f9927b900a79a012b5d52908b9d22ac3d2a401c
2016-05-27 14:43:26 -07:00
Yurii Zubrytskyi
91ed21a30e
Merge "[adb] Issue the "auth" emulator command before any other one"
...
am: 7c0835f66b
2016-05-27 21:36:49 +00:00
Treehugger Robot
7c0835f66b
Merge "[adb] Issue the "auth" emulator command before any other one"
2016-05-27 21:23:56 +00:00
Yurii Zubrytskyi
376b27532c
[adb] Issue the "auth" emulator command before any other one
...
Emulator console now requires authentication; this means
'adb emu ...' commands silently fail because of it.
This CL adds an 'auth <token>' command to each user command,
making sure it won't be silently ignored.
(cherry-pick of a9e2b99a7fdd31bcd6d852c6db26fe592236a24f.)
Bug: https://code.google.com/p/android/issues/detail?id=211233
Change-Id: Id9ca4999fd2e6393cc88278eaf444243e13c0ec0
2016-05-27 13:34:40 -07:00
Yurii Zubrytskyi
1098c529d1
[adb] Followup CL to clean up adb_auth_host.cpp
...
am: 049ebb810f
2016-05-27 19:36:31 +00:00
Yurii Zubrytskyi
f48adf6351
resolve merge conflicts of a9e2b99 to nyc-dev-plus-aosp
...
Change-Id: Ic77afb008f68ebc455d3a788119b669a52a254dc
2016-05-27 11:07:40 -07:00
Erik Kline
a5a9c74f20
Add /vendor/xbin to the list of directories of executables
...
Bug: 28850734
Change-Id: Iaa14a463294d1f8a9c69328a273ce7f12a558bab
2016-05-27 17:37:53 +09:00
Yurii Zubrytskyi
049ebb810f
[adb] Followup CL to clean up adb_auth_host.cpp
...
Get rid of unused includes + replace a fixed-size buffer with an
std::string
Change-Id: I4f9927b900a79a012b5d52908b9d22ac3d2a401c
2016-05-26 18:12:15 -07:00
Yurii Zubrytskyi
a9e2b99a7f
[adb] Issue the "auth" emulator command before any other one
...
Emulator console now requires authentication; this means
'adb emu ...' commands silently fail because of it.
This CL adds an 'auth <token>' command to each user command,
making sure it won't be silently ignored.
Bug: https://code.google.com/p/android/issues/detail?id=211233
Change-Id: Id9ca4999fd2e6393cc88278eaf444243e13c0ec0
2016-05-26 18:11:59 -07:00
Colin Cross
b50216ed86
Remove deprecated Android.mk files
...
These directories all have Android.bp files that are always used now,
delete the Android.mk files.
Change-Id: I8b0c89072a660c4a7a30fcefc76a7bbe247df977
2016-05-26 16:58:28 -07:00
Luis Hector Chavez
623ce74c83
core: Update libchrome APIs to r395517
...
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Change-Id: I0a0e0441b6a7486ff0b42d11136254d8a536788f
2016-05-26 11:29:53 -07:00
Yabin Cui
16dad488b3
Merge "adb: retry connecting disconnected emulators instead of always looping." am: 50e91fec0e
...
am: cfb0c5cd91
2016-05-26 02:10:10 +00:00
Yabin Cui
cfb0c5cd91
Merge "adb: retry connecting disconnected emulators instead of always looping."
...
am: 50e91fec0e
2016-05-26 01:58:01 +00:00
Yabin Cui
50e91fec0e
Merge "adb: retry connecting disconnected emulators instead of always looping."
2016-05-26 01:32:53 +00:00
Michael Ryleev
d66e05c6c4
Merge "trusty: storageproxyd: use upstream kernel headers" am: ed01d17e1b
...
am: 420d64de7b
2016-05-25 15:50:50 +00:00
Michael Ryleev
420d64de7b
Merge "trusty: storageproxyd: use upstream kernel headers"
...
am: ed01d17e1b
2016-05-25 15:47:55 +00:00
Michael Ryleev
ed01d17e1b
Merge "trusty: storageproxyd: use upstream kernel headers"
2016-05-25 15:40:05 +00:00
Elliott Hughes
f7571ca418
resolve merge conflicts of f0d4f38 to nyc-dev
...
am: 1265fd4934
2016-05-25 05:01:17 +00:00
Elliott Hughes
1265fd4934
resolve merge conflicts of f0d4f38 to nyc-dev
...
Change-Id: Ibce10a3c66560c10c67bd51f5b568552f43825f2
2016-05-24 17:22:51 -07:00
Yabin Cui
b74c6498aa
adb: retry connecting disconnected emulators instead of always looping.
...
Previously we loop through local ports every second, this patch improves
the strategy by retrying only just disconnected emulators.
Bug: 26468076
Bug: 19974213
Bug: 22920867
Change-Id: I43ccb746922d104202b0f81a3d163d850bbc890e
2016-05-24 16:38:47 -07:00
Elliott Hughes
f0d4f38773
resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563 am: c443a447b2
...
am: 5538f8bb63
2016-05-24 23:11:36 +00:00
Elliott Hughes
5538f8bb63
resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563
...
am: c443a447b2
2016-05-24 23:08:36 +00:00
Elliott Hughes
c443a447b2
resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1
...
am: 20b1e79563
2016-05-24 23:05:55 +00:00
Elliott Hughes
20b1e79563
resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3
...
am: a17f2802b1
2016-05-24 23:02:26 +00:00
Elliott Hughes
a17f2802b1
resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee
...
am: ad0c2bf5f3
2016-05-24 22:59:18 +00:00
Elliott Hughes
ad0c2bf5f3
resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6
...
am: 1a98776aee
2016-05-24 22:56:38 +00:00
Elliott Hughes
1a98776aee
resolve merge conflicts of 7f5da85 to lmp-dev
...
am: de529e72b6
2016-05-24 22:53:55 +00:00
Elliott Hughes
de529e72b6
resolve merge conflicts of 7f5da85 to lmp-dev
...
Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907
2016-05-24 15:23:48 -07:00
Elliott Hughes
7f5da85015
Fix scanf %s in lsof. am: 008efb756f
...
am: 491dfb11b7
2016-05-24 22:13:03 +00:00
Elliott Hughes
491dfb11b7
Fix scanf %s in lsof.
...
am: 008efb756f
2016-05-24 22:10:19 +00:00
Michael Ryleev
462461bd28
trusty: storageproxyd: use upstream kernel headers
...
Force usage of upstream kernel headers to pull in
definition of rpmb related structures.
This change is required until b/25567964 is resolved.
Change-Id: Ic710d32281dcdd093f6308b82ee937143b692613
Bug: 25567964
2016-05-24 14:52:38 -07:00
Michael Ryleev
1abb40cf43
Merge changes I40c9ea47,I593aeed5 am: c7878469be
...
am: 5cf2f5946c
2016-05-24 19:45:30 +00:00
Michael Ryleev
5cf2f5946c
Merge changes I40c9ea47,I593aeed5
...
am: c7878469be
2016-05-24 19:37:30 +00:00
Michael Ryleev
c7878469be
Merge changes I40c9ea47,I593aeed5
...
* changes:
trusty: storage: add tests
trusty: storage: add client lib for testing
2016-05-24 19:23:50 +00:00
Calin Juravle
9812105b20
Add utility to prepare files in a similar way to directories
...
Bug: 28785119
Bug: 28625993
Change-Id: I505eb4deca0a89f64fe4505dd6729fe6a48bc1aa
2016-05-24 18:19:12 +01:00
Dimitry Ivanov
fcd4ee48a4
Merge "Remove target_sdk_version parameter" into nyc-dev
...
am: 07f46c84e6
2016-05-24 17:15:12 +00:00
TreeHugger Robot
07f46c84e6
Merge "Remove target_sdk_version parameter" into nyc-dev
2016-05-24 16:59:12 +00:00
Dimitry Ivanov
94ee4e690d
Remove target_sdk_version parameter
...
Since linker-namespaces are enabled for all target_sdk_versions
and there is no longer need in workarounds in libnativeloader -
remove unused target_sdk_version parameter for internal calls.
This also brings libnativeloader closer to aosp/master
Bug: http://b/26040253
Change-Id: I7d6f6ac31be0dca5f3c3f6ea20e6cc87ce3a3c7f
2016-05-24 08:40:38 -07:00
Hans Boehm
d797b5cb8b
Merge "Fix SharedBuffer. Remove aref." into nyc-dev
...
am: 5668b84f99
2016-05-24 04:14:31 +00:00
Hans Boehm
5668b84f99
Merge "Fix SharedBuffer. Remove aref." into nyc-dev
2016-05-24 04:10:29 +00:00
Yabin Cui
e8b1cfe7d4
Merge "adb: close ep0 on disconnection." am: 18013f2083
...
am: 3082ca20a0
2016-05-24 02:42:52 +00:00
