Jeff Vander Stoep
a5a8cebb0a
Merge "Build split file_contexts on TREBLE builds" am: 2d03e64b95 am: f695cd1ec6
...
am: 33af0dc04c
2017-03-11 00:06:55 +00:00
Jeff Vander Stoep
33af0dc04c
Merge "Build split file_contexts on TREBLE builds" am: 2d03e64b95
...
am: f695cd1ec6
2017-03-11 00:03:20 +00:00
Jeff Vander Stoep
f695cd1ec6
Merge "Build split file_contexts on TREBLE builds"
...
am: 2d03e64b95
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
2017-03-10 23:00:40 +00:00
Christopher Ferris
83bc97b458
Merge "Add a 2 width option of clang format." am: 9a22ae5f57
...
am: 692048ae6b
2017-03-10 22:56:39 +00:00
Christopher Ferris
692048ae6b
Merge "Add a 2 width option of clang format."
...
am: 9a22ae5f57
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
Andreas Gampe
19c4f38402
Merge "ASAN: Separate SANITIZE_LITE from asan.options" am: e7195be772 am: ee7be79816
...
am: df13a9e51e
2017-03-10 21:18:24 +00:00
Andreas Gampe
df13a9e51e
Merge "ASAN: Separate SANITIZE_LITE from asan.options" am: e7195be772
...
am: ee7be79816
2017-03-10 21:14:53 +00:00
Andreas Gampe
ee7be79816
Merge "ASAN: Separate SANITIZE_LITE from asan.options"
...
am: e7195be772
2017-03-10 21:11:24 +00:00
Josh Gao
d90f42943e
Merge "adb: properly erase destroyed jdwp_trackers." am: e02eba8fd2 am: b0e8bbfc99
...
am: 6c54561d1e
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
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
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
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
Mark Salyzyn
cdd682d0e7
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5 am: ce7ee088ff am: 8294bbf2d0
...
am: 17754dc069
2017-03-10 15:30:03 +00:00
Mark Salyzyn
17754dc069
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5 am: ce7ee088ff
...
am: 8294bbf2d0
2017-03-10 15:26:08 +00:00
Mark Salyzyn
8294bbf2d0
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5
...
am: ce7ee088ff
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
2017-03-10 03:17:50 +00:00
Casey Dahlin
105e9b5ed8
Merge changes from topic 'adb-mdnsd' am: f4f95496ce am: 1b35c3f471
...
am: b3b862ed2e
2017-03-10 03:16:29 +00:00
Casey Dahlin
64c3954a37
Enable mDNS on Darwin am: 304150a521 am: bd2c93fab0
...
am: 31a2258afe
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
2017-03-10 03:16:15 +00:00
Casey Dahlin
025cb4ab09
Add mDNS device discovery for adb client am: 13a269ea24 am: b298855764
...
am: 50d1e6099e
2017-03-10 03:16:09 +00:00
Casey Dahlin
2bde29f5be
adb: Set a hostname for mDNS am: 1fe3cae67e am: f18d33c2c6
...
am: 0b13090ac7
2017-03-10 03:16:02 +00:00
Casey Dahlin
95431c53f4
Make ADBD announce its presence over mDNS am: 6cd5e0b4ef am: cc9c92fa95
...
am: 93b67d4897
2017-03-10 03:15:54 +00:00
Bowgo Tsai
9fc983315a
Merge changes from topic 'fstab_relocation' am: ac13718d0a
...
am: 8f7125fbee
2017-03-10 02:15:02 +00:00
Bowgo Tsai
8f7125fbee
Merge changes from topic 'fstab_relocation'
...
am: ac13718d0a
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
2017-03-10 01:21:24 +00:00
Casey Dahlin
31a2258afe
Enable mDNS on Darwin am: 304150a521
...
am: bd2c93fab0
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
2017-03-10 01:21:11 +00:00
Casey Dahlin
50d1e6099e
Add mDNS device discovery for adb client am: 13a269ea24
...
am: b298855764
2017-03-10 01:21:03 +00:00
Casey Dahlin
0b13090ac7
adb: Set a hostname for mDNS am: 1fe3cae67e
...
am: f18d33c2c6
2017-03-10 01:20:57 +00:00
Casey Dahlin
93b67d4897
Make ADBD announce its presence over mDNS am: 6cd5e0b4ef
...
am: cc9c92fa95
2017-03-10 01:20:50 +00:00
Casey Dahlin
1b35c3f471
Merge changes from topic 'adb-mdnsd'
...
am: f4f95496ce
2017-03-10 01:16:46 +00:00
Casey Dahlin
bd2c93fab0
Enable mDNS on Darwin
...
am: 304150a521
2017-03-10 01:16:31 +00:00
Casey Dahlin
cef0c7cf7d
Don't include mDNS support on platforms other than Linux
...
am: d6c8091e9f
2017-03-10 01:16:18 +00:00
Casey Dahlin
b298855764
Add mDNS device discovery for adb client
...
am: 13a269ea24
2017-03-10 01:16:05 +00:00
Casey Dahlin
f18d33c2c6
adb: Set a hostname for mDNS
...
am: 1fe3cae67e
2017-03-10 01:15:49 +00:00
Casey Dahlin
cc9c92fa95
Make ADBD announce its presence over mDNS
...
am: 6cd5e0b4ef
2017-03-10 01:15:31 +00:00
Treehugger Robot
f4f95496ce
Merge changes from topic 'adb-mdnsd'
...
* changes:
Make ADB over mDNS work on Windows
Enable mDNS on Darwin
Don't include mDNS support on platforms other than Linux
Add mDNS device discovery for adb client
adb: Set a hostname for mDNS
Make ADBD announce its presence over mDNS
2017-03-10 01:09:42 +00:00
Wei Wang
8c1e3292a8
Merge "init.rc: make sure netd start after post-fs-data" am: f58280e7dc am: 449b59873f
...
am: 07ace62093
2017-03-09 23:56:30 +00:00
Wei Wang
07ace62093
Merge "init.rc: make sure netd start after post-fs-data" am: f58280e7dc
...
am: 449b59873f
2017-03-09 23:35:30 +00:00
Wei Wang
449b59873f
Merge "init.rc: make sure netd start after post-fs-data"
...
am: f58280e7dc
2017-03-09 23:32:35 +00:00
