380693666d
Merge "Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 am: deb4e6e596" into nyc-mr1-dev-plus-aosp
2016-05-30 02:41:16 +00:00
9bff938588
Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40
...
am: b927c6c39d
2016-05-30 02:41:03 +00:00
6e65e345e7
Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40
...
am: deb4e6e596
2016-05-30 02:41:03 +00:00
deb4e6e596
Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev
...
am: 088f0e7c40
2016-05-30 02:36:42 +00:00
b927c6c39d
Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev
...
am: 088f0e7c40
2016-05-30 02:36:41 +00:00
088f0e7c40
Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev
2016-05-30 02:31:46 +00:00
6e1ec81f31
Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d am: b8901de2ad
...
am: 8d96370fb2
2016-05-28 02:19:50 +00:00
8d96370fb2
Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d
...
am: b8901de2ad
2016-05-28 02:17:19 +00:00
b8901de2ad
Merge "Kill adb\'s ScopedFd for unique_fd."
...
am: 0f3fde210d
2016-05-28 02:14:27 +00:00
0f3fde210d
Merge "Kill adb's ScopedFd for unique_fd."
2016-05-28 02:06:18 +00:00
2ce86e527b
Kill adb's ScopedFd for unique_fd.
...
It's the adb unique_fd, but at least it's the same API...
Change-Id: If5d6642457e145c450374fde6f1358e5ac386a96
2016-05-27 17:51:24 -07:00
c4600fb81a
Merge "Kill load_file." am: b42e4a6b63 am: 198a727891
...
am: 500c7e5bc7
2016-05-28 00:33:02 +00:00
500c7e5bc7
Merge "Kill load_file." am: b42e4a6b63
...
am: 198a727891
2016-05-28 00:30:31 +00:00
198a727891
Merge "Kill load_file."
...
am: b42e4a6b63
2016-05-28 00:28:02 +00:00
b42e4a6b63
Merge "Kill load_file."
2016-05-28 00:17:10 +00:00
c9ff51e16b
Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4 am: 979998b965
...
am: e5635175ab
2016-05-28 00:07:09 +00:00
496e073864
resolve merge conflicts of 5fb629a to nyc-mr1-dev-plus-aosp
...
Change-Id: I6424b08182637e7885b57119bc5eb6d5e3708c45
2016-05-27 17:01:44 -07:00
3efa16ba35
Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev
...
am: 8024f8f9ea
2016-05-27 23:42:54 +00:00
e5635175ab
Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4
...
am: 979998b965
2016-05-27 23:21:49 +00:00
8024f8f9ea
Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev
2016-05-27 23:14:16 +00:00
e8b663fec3
Kill load_file.
...
Change-Id: I6c332f7d8e94d513605295b3d4d32c4e1cf878dc
2016-05-27 16:14:02 -07:00
979998b965
Merge "[adb] Followup CL to clean up adb_auth_host.cpp"
...
am: 9c7f9215e4
2016-05-27 23:13:04 +00:00
9c7f9215e4
Merge "[adb] Followup CL to clean up adb_auth_host.cpp"
2016-05-27 23:08:06 +00:00
5fb629a212
resolve merge conflicts of e845c04 to nyc-dev-plus-aosp
...
Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6
2016-05-27 16:04:21 -07:00
e845c04f12
Merge "Fix misc-macro-parentheses warnings in init and other core modules."
...
am: ac080d2128
2016-05-27 22:55:22 +00:00
ac080d2128
Merge "Fix misc-macro-parentheses warnings in init and other core modules."
2016-05-27 22:44:15 +00:00
3ace495a5d
resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp
...
am: 70ca8dcb0b
2016-05-27 22:00:07 +00:00
70ca8dcb0b
resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp
...
Change-Id: Id8d69ba8c0e04e6772c8b9a6318380de26d47b2a
2016-05-27 14:50:58 -07:00
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
91ed21a30e
Merge "[adb] Issue the "auth" emulator command before any other one"
...
am: 7c0835f66b
2016-05-27 21:36:49 +00:00
7c0835f66b
Merge "[adb] Issue the "auth" emulator command before any other one"
2016-05-27 21:23:56 +00:00
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
bcd4058f47
[adb] Followup CL to clean up adb_auth_host.cpp am: 049ebb810f
...
am: 1098c529d1
2016-05-27 19:41:16 +00:00
eb58df6eed
[adb] Followup CL to clean up adb_auth_host.cpp am: 049ebb810f
...
am: 998496bc66
2016-05-27 19:41:02 +00:00
998496bc66
[adb] Followup CL to clean up adb_auth_host.cpp
...
am: 049ebb810f
2016-05-27 19:36:41 +00:00
1098c529d1
[adb] Followup CL to clean up adb_auth_host.cpp
...
am: 049ebb810f
2016-05-27 19:36:31 +00:00
ef319c5f46
resolve merge conflicts of a9e2b99 to nyc-dev-plus-aosp
...
am: f48adf6351
2016-05-27 19:03:28 +00:00
2cdb924831
resolve merge conflicts of 204e3fa to nyc-mr1-dev-plus-aosp
...
Change-Id: I7fa657156de238c37e7f75a34aac8212855bc4f4
2016-05-27 11:11:22 -07:00
f48adf6351
resolve merge conflicts of a9e2b99 to nyc-dev-plus-aosp
...
Change-Id: Ic77afb008f68ebc455d3a788119b669a52a254dc
2016-05-27 11:07:40 -07:00
204e3fa786
[adb] Issue the "auth" emulator command before any other one
...
am: a9e2b99a7f
2016-05-27 17:38:35 +00:00
7c198d3eef
Make file encryption type available
...
am: 4e898a01fd
2016-05-27 17:13:29 +00:00
4e898a01fd
Make file encryption type available
...
Bug: 28905864
Change-Id: I5f59f824fd92c32ff87aa730dc5c0f250564c0a9
2016-05-27 09:38:29 -07:00
a5a9c74f20
Add /vendor/xbin to the list of directories of executables
...
Bug: 28850734
Change-Id: Iaa14a463294d1f8a9c69328a273ce7f12a558bab
2016-05-27 17:37:53 +09:00
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
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
74521c93de
Revert "adb: close ep0 on disconnection."
...
am: 57de0514f0
2016-05-27 00:56:13 +00:00
57de0514f0
Revert "adb: close ep0 on disconnection."
...
This reverts commit 69e97e4bee
2016-05-26 17:25:32 -07:00
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
32cabf25aa
fs_mgr: update block device reference in verity metadata
...
The dm-verity metadata contains the block device path that is given to
the dm-android-verity driver. If the device is using slot A/B, this
path is missing the slot suffix.
This patch makes fs_mgr replace all the block device path reference
with the one including the active slot suffix.
Change-Id: Ib624d0d18b12a8a287cac7f15605a2e0fb7c97c6
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Bug: 28845874
2016-05-26 15:37:37 -07:00
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
Android Build Merger (Role)