David Lin
a44f638a01
Merge "init.rc: enable ledtrig-transient support for vibrator" am: 75b66a6f2a
am: 64af4183a1
...
am: f357e1989a
Change-Id: I98daea756aceeaeaca099bfb6dd668c68c58a8dd
2017-03-11 01:35:24 +00:00
TreeHugger Robot
decccc2e8f
Merge "Remove BlobCAche from libutils"
2017-03-11 01:32:47 +00:00
David Lin
f357e1989a
Merge "init.rc: enable ledtrig-transient support for vibrator" am: 75b66a6f2a
...
am: 64af4183a1
Change-Id: Iad3180dc22a6a232dd60da4c83c502325f30f33f
2017-03-11 01:31:47 +00:00
David Lin
64af4183a1
Merge "init.rc: enable ledtrig-transient support for vibrator"
...
am: 75b66a6f2a
Change-Id: I70c278c537fd96b428a85755d40f114cf0ff2a29
2017-03-11 01:28:19 +00:00
TreeHugger Robot
c4c9397bf6
Merge changes from topic 'libutils-remove-string'
...
* changes:
storaged: remove usage of String16::std_string
Add missing includes.
2017-03-11 01:26:26 +00:00
Treehugger Robot
75b66a6f2a
Merge "init.rc: enable ledtrig-transient support for vibrator"
2017-03-11 01:23:18 +00:00
Jeff Vander Stoep
a5a8cebb0a
Merge "Build split file_contexts on TREBLE builds" am: 2d03e64b95
am: f695cd1ec6
...
am: 33af0dc04c
Change-Id: Ia62229843dfa0d1ef176f7adc9138f481f3d8cf7
2017-03-11 00:06:55 +00:00
Jeff Vander Stoep
33af0dc04c
Merge "Build split file_contexts on TREBLE builds" am: 2d03e64b95
...
am: f695cd1ec6
Change-Id: I2cc31e39a985770278460f1695593523216846b1
2017-03-11 00:03:20 +00:00
Jeff Vander Stoep
f695cd1ec6
Merge "Build split file_contexts on TREBLE builds"
...
am: 2d03e64b95
Change-Id: I76eacc102235ba5b989a15f678c8ecbf5b744ff8
2017-03-10 23:59:48 +00:00
Treehugger Robot
2d03e64b95
Merge "Build split file_contexts on TREBLE builds"
2017-03-10 23:54:18 +00:00
Christopher Ferris
4d8d43b37a
Merge "Add a 2 width option of clang format." am: 9a22ae5f57
am: 692048ae6b
...
am: 83bc97b458
Change-Id: I64f06d173c2074b2316d133d5d396e1221942336
2017-03-10 23:00:40 +00:00
Christopher Ferris
83bc97b458
Merge "Add a 2 width option of clang format." am: 9a22ae5f57
...
am: 692048ae6b
Change-Id: I2c35bf8806121dc16ff7c9dd18189291e1140158
2017-03-10 22:56:39 +00:00
Christopher Ferris
692048ae6b
Merge "Add a 2 width option of clang format."
...
am: 9a22ae5f57
Change-Id: Id8022fe0da3d6940d68b5fead2ee431f7065f9f9
2017-03-10 22:53:09 +00:00
Christopher Ferris
9a22ae5f57
Merge "Add a 2 width option of clang format."
2017-03-10 22:46:29 +00:00
Steven Moreland
629843670a
storaged: remove usage of String16::std_string
...
<string> is being removed from String16
Test: adb shell dumpsys storaged <all options>
Change-Id: I234ecd64d9c481cb2eeee883a715f2fbfaecc511
2017-03-10 21:35:31 +00:00
Andreas Gampe
19c4f38402
Merge "ASAN: Separate SANITIZE_LITE from asan.options" am: e7195be772
am: ee7be79816
...
am: df13a9e51e
Change-Id: Ia3f1b5b5a7ecac19658da9b1700d9f860f3005ae
2017-03-10 21:18:24 +00:00
Andreas Gampe
df13a9e51e
Merge "ASAN: Separate SANITIZE_LITE from asan.options" am: e7195be772
...
am: ee7be79816
Change-Id: I61a2083dbd4d7d895a7d5fd859b694e808e537c5
2017-03-10 21:14:53 +00:00
Andreas Gampe
ee7be79816
Merge "ASAN: Separate SANITIZE_LITE from asan.options"
...
am: e7195be772
Change-Id: I6b7c8f2dede303b1b2168888ede8c9e3f8062688
2017-03-10 21:11:24 +00:00
Josh Gao
d90f42943e
Merge "adb: properly erase destroyed jdwp_trackers." am: e02eba8fd2
am: b0e8bbfc99
...
am: 6c54561d1e
Change-Id: I1a7572937842cf8a80a518e61681c4c88c7285f7
2017-03-10 21:07:24 +00:00
Treehugger Robot
e7195be772
Merge "ASAN: Separate SANITIZE_LITE from asan.options"
2017-03-10 21:03:56 +00:00
Josh Gao
6c54561d1e
Merge "adb: properly erase destroyed jdwp_trackers." am: e02eba8fd2
...
am: b0e8bbfc99
Change-Id: I4c6b3d1acb3b75a2fce6d850b256b15c823c3de1
2017-03-10 21:03:53 +00:00
Christopher Ferris
a78d9a293c
Add a 2 width option of clang format.
...
Make the default the 4 tab space version.
Add a link to the 2 space version for libbacktrace.
The only other difference between the 4 space and 2 space tab version
is that the 2 space tab version allows short functions on a single line.
This is for things like constructors, short destructors, or accessor
functions. I believe this is closer to the Google C++ style guide.
Bug: 36046320
Test: NA
Change-Id: Ida08db18902eeb101f42869dd5590182529d54ef
2017-03-10 13:01:39 -08:00
Josh Gao
b0e8bbfc99
Merge "adb: properly erase destroyed jdwp_trackers."
...
am: e02eba8fd2
Change-Id: Ia87892fecebc64198b70acf089aa7eac3652175e
2017-03-10 21:00:23 +00:00
Treehugger Robot
e02eba8fd2
Merge "adb: properly erase destroyed jdwp_trackers."
2017-03-10 20:54:51 +00:00
Mathias Agopian
f088e4e238
Remove BlobCAche from libutils
...
it has moved to libEGL which was the only client.
Test: compiled & Run
Bug: vndk-stable
Change-Id: Ife18727fa1c48b1be6910058867016348b7f02c1
2017-03-10 12:27:46 -08:00
Josh Gao
6def9bd67c
adb: properly erase destroyed jdwp_trackers.
...
std::remove_if moves to-be-removed elements to the end of the vector
and returns an iterator that must be .erased.
Bug: http://b/35772578
Test: mma
Change-Id: Idfe8520e176204ac5ce000c30704873a3ffe6c9c
2017-03-10 11:24:37 -08:00
Andreas Gampe
21bb2e0388
ASAN: Separate SANITIZE_LITE from asan.options
...
Add SANITIZE_LITE_SERVICES to drive usage of asan.options for a
large set of native services.
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true SANITIZE_LITE_SERVICES=true
Change-Id: I84458dcc1b193b762daeb3004cf6c49e2fd8fae2
2017-03-10 10:48:00 -08:00
Steven Moreland
d21cfab244
Add missing includes.
...
Includes are transitively imported by <string> in String8.h + String16.h
but that include is being removed.
Test: pass
Change-Id: Ide5c011b40b4a4f031dd26ead08b5c8d5d299693
2017-03-10 09:05:30 -08:00
Mark Salyzyn
cdd682d0e7
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5 am: ce7ee088ff
am: 8294bbf2d0
...
am: 17754dc069
Change-Id: I5c64ef1ea0af0f5671ef977eec6d0e1e57960551
2017-03-10 15:30:03 +00:00
Mark Salyzyn
17754dc069
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5 am: ce7ee088ff
...
am: 8294bbf2d0
Change-Id: I3730c43e182704edb77cddbd5ea4c6a3fdd95f7c
2017-03-10 15:26:08 +00:00
Mark Salyzyn
8294bbf2d0
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5
...
am: ce7ee088ff
Change-Id: I952d27f5b06753ae424a7e92b9511c95ef0c355b
2017-03-10 15:22:05 +00:00
Treehugger Robot
ce7ee088ff
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5
...
* changes:
liblog: replace "frontend" with "transport"
liblog: stay away from C++ keyword private
liblog: specify clang format
2017-03-10 15:15:22 +00:00
Bowgo Tsai
eeea724900
Merge changes from topic 'fstab_relocation' am: ac13718d0a
am: 8f7125fbee
...
am: 9fc983315a
Change-Id: Ic62c46c160e9995ff11067300ec5c831301bceb9
2017-03-10 03:17:50 +00:00
Casey Dahlin
105e9b5ed8
Merge changes from topic 'adb-mdnsd' am: f4f95496ce
am: 1b35c3f471
...
am: b3b862ed2e
Change-Id: I76a582914bb4d88350b9c9e1a30f99b2917b5b5a
2017-03-10 03:16:29 +00:00
Casey Dahlin
64c3954a37
Enable mDNS on Darwin am: 304150a521
am: bd2c93fab0
...
am: 31a2258afe
Change-Id: I392af0dabe9268ed1a5cb93c0ad9ec47a188dd2e
2017-03-10 03:16:22 +00:00
Casey Dahlin
95f524c01f
Don't include mDNS support on platforms other than Linux am: d6c8091e9f
am: cef0c7cf7d
...
am: e7a31f3ef7
Change-Id: Iad440a42831e05955c221ba9a0f45f0b581afa9a
2017-03-10 03:16:15 +00:00
Casey Dahlin
025cb4ab09
Add mDNS device discovery for adb client am: 13a269ea24
am: b298855764
...
am: 50d1e6099e
Change-Id: Ic54681f0946148950077e2a1dc45471bf3f72039
2017-03-10 03:16:09 +00:00
Casey Dahlin
2bde29f5be
adb: Set a hostname for mDNS am: 1fe3cae67e
am: f18d33c2c6
...
am: 0b13090ac7
Change-Id: I84093fc1f5e652e401333c428c9a200de4f02890
2017-03-10 03:16:02 +00:00
Casey Dahlin
95431c53f4
Make ADBD announce its presence over mDNS am: 6cd5e0b4ef
am: cc9c92fa95
...
am: 93b67d4897
Change-Id: I508268eae4a98a9e51e2ca7647cd9b3f9d932f9c
2017-03-10 03:15:54 +00:00
Bowgo Tsai
9fc983315a
Merge changes from topic 'fstab_relocation' am: ac13718d0a
...
am: 8f7125fbee
Change-Id: Ic350345536d3d6faf63c1e75a205b56a934a3657
2017-03-10 02:15:02 +00:00
Bowgo Tsai
8f7125fbee
Merge changes from topic 'fstab_relocation'
...
am: ac13718d0a
Change-Id: Id94e7c5cc454f5b7d9c7b410d3358eaaa8768a97
2017-03-10 02:12:38 +00:00
Treehugger Robot
ac13718d0a
Merge changes from topic 'fstab_relocation'
...
* changes:
init: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()
fs_mgr: support reading fstab file from /odm or /vendor partition
fs_mgr: add fs_mgr_read_fstab_with_dt() API
2017-03-10 02:07:34 +00:00
Po-Chien Hsueh
8245942609
Merge "fs_config: Move hostapd to vendor partition"
2017-03-10 02:02:27 +00:00
Casey Dahlin
b3b862ed2e
Merge changes from topic 'adb-mdnsd' am: f4f95496ce
...
am: 1b35c3f471
Change-Id: Ie93a0a2d4361bcc8d18d3433c0cc0369a864c815
2017-03-10 01:21:24 +00:00
Casey Dahlin
31a2258afe
Enable mDNS on Darwin am: 304150a521
...
am: bd2c93fab0
Change-Id: Ic05f4e2c36f5f4ea70ce876fdf8d6d66ea69cd32
2017-03-10 01:21:17 +00:00
Casey Dahlin
e7a31f3ef7
Don't include mDNS support on platforms other than Linux am: d6c8091e9f
...
am: cef0c7cf7d
Change-Id: Ibc4115bed3614554ad7853928aee3c16937dfc9b
2017-03-10 01:21:11 +00:00
Casey Dahlin
50d1e6099e
Add mDNS device discovery for adb client am: 13a269ea24
...
am: b298855764
Change-Id: I9a38becff693264e91baa38ce1fd485c3443d1aa
2017-03-10 01:21:03 +00:00
Casey Dahlin
0b13090ac7
adb: Set a hostname for mDNS am: 1fe3cae67e
...
am: f18d33c2c6
Change-Id: I1e9a6c54252ded977a6b7ae90d545d6204f89dbd
2017-03-10 01:20:57 +00:00
Casey Dahlin
93b67d4897
Make ADBD announce its presence over mDNS am: 6cd5e0b4ef
...
am: cc9c92fa95
Change-Id: Icbf846986969db2932f049451fa1c40b333ba3e1
2017-03-10 01:20:50 +00:00
Casey Dahlin
1b35c3f471
Merge changes from topic 'adb-mdnsd'
...
am: f4f95496ce
Change-Id: I1749f913b8c5cca64880d3eec3009f850bc9141e
2017-03-10 01:16:46 +00:00