Commit graph

28844 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Casey Dahlin
bd2c93fab0 Enable mDNS on Darwin
am: 304150a521

Change-Id: Id0d77614fc3bf580c2879b9ad801c77dcbfc7752
2017-03-10 01:16:31 +00:00
Casey Dahlin
cef0c7cf7d Don't include mDNS support on platforms other than Linux
am: d6c8091e9f

Change-Id: Ife0b6e08098c05288c3ea63e9063e5116335716a
2017-03-10 01:16:18 +00:00
Casey Dahlin
b298855764 Add mDNS device discovery for adb client
am: 13a269ea24

Change-Id: Ib5f80b3ccc9db7c6fe6f5c989e82083d734ce4df
2017-03-10 01:16:05 +00:00
Casey Dahlin
f18d33c2c6 adb: Set a hostname for mDNS
am: 1fe3cae67e

Change-Id: Iea8700ec13502e58774968cd7383255f769fa105
2017-03-10 01:15:49 +00:00
Casey Dahlin
cc9c92fa95 Make ADBD announce its presence over mDNS
am: 6cd5e0b4ef

Change-Id: Ida2f133f72087f291f2d34e968503ae81c3fbd50
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
07ace62093 Merge "init.rc: make sure netd start after post-fs-data" am: f58280e7dc
am: 449b59873f

Change-Id: I74c0caf08c9fc9124c900c82155988d3697840f9
2017-03-09 23:35:30 +00:00
Wei Wang
449b59873f Merge "init.rc: make sure netd start after post-fs-data"
am: f58280e7dc

Change-Id: I8925325eec13607ae9a048091f178d52778b41ac
2017-03-09 23:32:35 +00:00
Treehugger Robot
f58280e7dc Merge "init.rc: make sure netd start after post-fs-data" 2017-03-09 23:29:24 +00:00
Josh Gao
df6ea17f67 Merge changes from topic 'debuggerd_fallback' am: 48a31877f0
am: 4048633404

Change-Id: I903d2de5a839f66ac8fd0f6621bff07da859f7a6
2017-03-09 22:11:42 +00:00
Josh Gao
0600f02f98 debuggerd_handler: implement missing fallback functionality. am: e1aa0ca58a
am: 75c3c69c06

Change-Id: Iea3b889aeecda7b9b2978d105209d52f5294ef35
2017-03-09 22:11:35 +00:00
Josh Gao
4048633404 Merge changes from topic 'debuggerd_fallback'
am: 48a31877f0

Change-Id: I7a0721fc9cdce17975b5160ad65e6c61e12fcf87
2017-03-09 22:08:50 +00:00
Josh Gao
75c3c69c06 debuggerd_handler: implement missing fallback functionality.
am: e1aa0ca58a

Change-Id: I917d18f94b2231a451e0f3e7304477a2e124db4c
2017-03-09 22:08:41 +00:00
Josh Gao
48a31877f0 Merge changes from topic 'debuggerd_fallback'
* changes:
  libdebuggerd: add compatibility shim.
  debuggerd_handler: implement missing fallback functionality.
2017-03-09 22:03:31 +00:00
Wei Wang
bae9ba3402 init.rc: make sure netd start after post-fs-data
Current init doesn't order the triggeres it scaned, and there is no
guarantee that general event trigger exec first and then event+property
triggers.

This CL will make sure netd started after post-fs-data trigger is done.

Bug: 35110957
Test: marlin boots
Change-Id: I7bb55af4e00f336682388abfa8a06eac2136b7d4
2017-03-09 13:53:39 -08:00
Alex Klyubin
33153c6c0d Merge "Remove hard-coded policy version from secilc step" am: df2ad0b4ab
am: f7fd531a75

Change-Id: If28e0ea58ef447c3eda58ef3f5900251eabf8001
2017-03-09 21:09:50 +00:00
Alex Klyubin
f7fd531a75 Merge "Remove hard-coded policy version from secilc step"
am: df2ad0b4ab

Change-Id: Id306db22e2bc02518389314ed377d424ce2fc22a
2017-03-09 21:07:21 +00:00
Treehugger Robot
df2ad0b4ab Merge "Remove hard-coded policy version from secilc step" 2017-03-09 21:03:44 +00:00
Josh Gao
9eb4eb1811 libdebuggerd: add compatibility shim.
Avoid breaking internal code when AOSP automerges to internal.

This will be reverted after fixing up the uses on the other end.

Bug: http://b/35858739
Test: treehugger
Change-Id: If1ee03d8d7c218d3ad9f451cfe9a9077753dda02
2017-03-09 12:13:16 -08:00
Josh Gao
e1aa0ca58a debuggerd_handler: implement missing fallback functionality.
Allow the fallback implementation to dump traces and create tombstones
in seccomped processes.

Bug: http://b/35858739
Test: debuggerd -b `pidof media.codec`; killall -ABRT media.codec
Change-Id: I381b283de39a66d8900f1c320d32497d6f2b4ec4
2017-03-09 11:26:05 -08:00
Alex Klyubin
a71dfec4c2 Remove hard-coded policy version from secilc step
This change makes init's SELinux policy compilation step target the
highest SELinux policy language version supported by the kernel.
Prior to this change the version was simply hard-coded in init.

P. S. clang-format (part of presubmit for this change) is being
counter-productive trying to format the section with secilc
parameters. The resulting layout is harder to read. This commit thus
disables clang-format for this section of code and formats the code
for improved readability.

Test: Remove precompiled policy, device boots up, no new denials.
      Added log statement to print out the policy version passed
      into secilc -- it printed 30, as expected.
Bug: 31363362

Change-Id: I151017b5211712861bafb662525e794a44026dd2
2017-03-09 11:11:23 -08:00
Mark Salyzyn
81321a7980 liblog: replace "frontend" with "transport"
We still do not have any users of the 'frontend' interface, let's
right a wrong and rename it to 'transport' as it makes more sense.
Renames android_log_set_frontend, android_log_get_frontend and
include/log/log_frontend.h.

SideEffects: None
Test: gTest liblog-unit-tests
Bug: 27405083
Change-Id: I7c1c0f3dfdc7cf047285403e306edbd16ad1324d
2017-03-09 09:36:34 -08:00