Elliott Hughes
34965eb118
Merge "libnetutils: Check socket() return value" am: e4b332c7e4
...
am: be6d330c18
* commit 'be6d330c18f861fe10c0b238f74cecb2c9783205':
libnetutils: Check socket() return value
2016-01-12 04:53:01 +00:00
Ching Tzung Lin
c9e7c2da2d
Mount debugfs earlier regardless build variant am: df2d782368
am: 905ad1d3e7
am: 4ce0a17f89
-s ours
...
am: ebb00c8155
* commit 'ebb00c81559c7be650c01b259d44e7a089a877c7':
Mount debugfs earlier regardless build variant
2016-01-12 04:52:55 +00:00
Dimitry Ivanov
6082622b18
Merge "Make libwebviewchromium_plat_support.so public" am: cd60e4bdd6
...
am: ce292ad06c
* commit 'ce292ad06ccd38beaa2d7bf8add13dbdf01f91e5':
Make libwebviewchromium_plat_support.so public
2016-01-12 04:52:47 +00:00
Elliott Hughes
be6d330c18
Merge "libnetutils: Check socket() return value"
...
am: e4b332c7e4
* commit 'e4b332c7e4ce19e1e2e6d8fe001d8c9e1709f280':
libnetutils: Check socket() return value
2016-01-12 04:50:38 +00:00
Elliott Hughes
e4b332c7e4
Merge "libnetutils: Check socket() return value"
2016-01-12 04:46:37 +00:00
Dimitry Ivanov
ba01a14659
Merge "Add libart.so to the list of public libraries"
2016-01-12 03:07:27 +00:00
Steve Fung
c490e0fe98
crash_reporter: Remove udev collector from Android build
...
Currently one of the udev collector tests is failing due to the lack
of gzip on the device. Since we don't have gzip nor udev in Android builds,
remove the udev collector (and tests) from Android builds.
See http://r.android.com/184708 for discussion on removing the udev
collector completely from the source.
Bug: 25779348
Test: `/data/nativetest/crash_reporter_tests/crash_reporter_tests` passes
Change-Id: I883359ac8219f2e1fa6a78927433dbc0be295fe7
2016-01-12 01:46:51 +00:00
Ching Tzung Lin
ebb00c8155
Mount debugfs earlier regardless build variant am: df2d782368
am: 905ad1d3e7
...
am: 4ce0a17f89
-s ours
* commit '4ce0a17f8903fda898d482e62ad6eee933bb5482':
Mount debugfs earlier regardless build variant
2016-01-11 23:19:12 +00:00
Dimitry Ivanov
3d5a43449f
Add libart.so to the list of public libraries
...
This is a temporary workaround for apps relying
on libart internal state.
Bug: http://b/26436837
Change-Id: Ibd6a766c3c8edebe885d897565a72a7a407828c3
2016-01-11 14:53:59 -08:00
Ching Tzung Lin
4ce0a17f89
Mount debugfs earlier regardless build variant am: df2d782368
...
am: 905ad1d3e7
* commit '905ad1d3e7531b49374573cd801fa92a480c97b8':
Mount debugfs earlier regardless build variant
2016-01-11 22:51:48 +00:00
Ching Tzung Lin
905ad1d3e7
Mount debugfs earlier regardless build variant
...
am: df2d782368
* commit 'df2d78236834f5f6a99e88c8cd629b09d8292bb6':
Mount debugfs earlier regardless build variant
2016-01-11 22:50:00 +00:00
Mark Salyzyn
507eb9fec2
logd: prune maintain per-id watermark
...
Without this change LogBuffer::prune and LogBuffer::erase
contributes 16.7% and 1.79% respectively. With this change,
they contributes 3.06 and 2.33% respectively. Pruning is
performed roughly 1 in every 255 log entries, a periodic
tamer latency spike.
Bug: 23685592
Change-Id: I6ae1cf9f3559bca4cf448efe8bcb2b96a1914c54
2016-01-11 14:46:51 -08:00
Tom Cherry
c787cf291a
Remove special case handling of "ro." properties permissions
...
Currently, properties that begin with "ro." are special cased to skip
over the "ro." part of the prefix before matching with entries in
property_contexts. This is not strictly needed however and it is
causing complications with the separated prop files work from Bug
21852512, so it is now removed.
Bug 26425619
Change-Id: I3cd14fa2176f96b3931e5f6a50c4a7bcd3af3da6
2016-01-11 14:00:40 -08:00
Ching Tzung Lin
df2d782368
Mount debugfs earlier regardless build variant
...
ag/835596 can be reverted after this CL is merged.
BUG:26455292
Change-Id: I453b0f1d08d822f8cd2d4d33f1c1b21f0d7f543a
2016-01-11 13:00:22 -08:00
Nick Kralevich
39bf768138
am 55db2ebc: am ada332e4: am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts" am: acff074844
...
am: 5984267a54
* commit '5984267a544228a1944fb869f27ab20766025118':
2016-01-11 18:21:18 +00:00
Nick Kralevich
5496fe7916
am 21de44a8: am ec9bd166: am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available" am: e4e912c7e4
...
am: 4902084150
* commit '4902084150026b53e3a56dbbe1b073e1788590a4':
2016-01-11 18:21:12 +00:00
Nick Kralevich
837207e91c
am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts" am: eab1e21996
...
am: 0d451960a5
* commit '0d451960a515d23c769be2bb42cc902ec10d427a':
2016-01-11 18:21:05 +00:00
Nick Kralevich
3052c31e42
am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available" am: 14adea307d
...
am: c157a769d0
* commit 'c157a769d00c804c6e2bbadf809016ff9b092f5b':
2016-01-11 18:20:57 +00:00
Nick Kralevich
5984267a54
am 55db2ebc: am ada332e4: am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"
...
am: acff074844
* commit 'acff074844c263d2b453cad33b6e7a2852f9311e':
2016-01-11 18:09:33 +00:00
Nick Kralevich
4902084150
am 21de44a8: am ec9bd166: am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"
...
am: e4e912c7e4
* commit 'e4e912c7e43bfe4802e825a5c6dbd9dbb42b3590':
2016-01-11 18:09:24 +00:00
Nick Kralevich
0d451960a5
am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"
...
am: eab1e21996
* commit 'eab1e21996884fb1918e696efd21c175d96f6195':
2016-01-11 18:09:15 +00:00
Nick Kralevich
c157a769d0
am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"
...
am: 14adea307d
* commit '14adea307d86507fabdbb61a1ca27cf846f1f73e':
2016-01-11 18:09:04 +00:00
Dimitry Ivanov
ce292ad06c
Merge "Make libwebviewchromium_plat_support.so public"
...
am: cd60e4bdd6
* commit 'cd60e4bdd61b9ab5d293c4c2ac2936a9cf28668e':
Make libwebviewchromium_plat_support.so public
2016-01-11 18:06:06 +00:00
Dimitry Ivanov
cd60e4bdd6
Merge "Make libwebviewchromium_plat_support.so public"
2016-01-11 17:59:30 +00:00
Jorge Lucangeli Obes
c76e2a8dad
Merge "adbd: Depend only on libminijail." am: 6fe9930722
...
am: 3cdfb3b0aa
* commit '3cdfb3b0aa6ae36663fb80a628ceda388da95cd6':
adbd: Depend only on libminijail.
2016-01-09 00:17:58 +00:00
Jorge Lucangeli Obes
3cdfb3b0aa
Merge "adbd: Depend only on libminijail."
...
am: 6fe9930722
* commit '6fe993072282c14419198e4a5bd84872637d30a5':
adbd: Depend only on libminijail.
2016-01-09 00:15:20 +00:00
Elliott Hughes
81a70ac08e
Merge "Improve dumb terminal support (emacs is dumb)." am: 46798ecd17
...
am: ec97cb8b50
* commit 'ec97cb8b509f06e658cfa2a2fb86e0fbe8e28e25':
Improve dumb terminal support (emacs is dumb).
2016-01-09 00:13:09 +00:00
Elliott Hughes
ec97cb8b50
Merge "Improve dumb terminal support (emacs is dumb)."
...
am: 46798ecd17
* commit '46798ecd1700c62472b9040e49a69207c5e33834':
Improve dumb terminal support (emacs is dumb).
2016-01-09 00:09:03 +00:00
Jorge Lucangeli Obes
6fe9930722
Merge "adbd: Depend only on libminijail."
2016-01-08 23:59:32 +00:00
Elliott Hughes
46798ecd17
Merge "Improve dumb terminal support (emacs is dumb)."
2016-01-08 23:53:30 +00:00
Elliott Hughes
d68ad69d1d
Improve dumb terminal support (emacs is dumb).
...
Bug: http://b/26444032
Change-Id: Iaff4b09b613fd30ab7c4c73e096da34f37e0de07
2016-01-08 15:47:07 -08:00
Jorge Lucangeli Obes
4fc0c3d92a
Merge "adbd: Remove check for set_supplementary_gids." am: fd3c12d224
...
am: 7356218161
* commit '7356218161220848920d5e117d304d442b79f44f':
adbd: Remove check for set_supplementary_gids.
2016-01-08 23:06:21 +00:00
Jorge Lucangeli Obes
7356218161
Merge "adbd: Remove check for set_supplementary_gids."
...
am: fd3c12d224
* commit 'fd3c12d22403860506da56e763cdf3c373f6cd86':
adbd: Remove check for set_supplementary_gids.
2016-01-08 23:03:40 +00:00
Jorge Lucangeli Obes
fd3c12d224
Merge "adbd: Remove check for set_supplementary_gids."
2016-01-08 22:49:00 +00:00
Alex Vakulenko
979c9950e5
Merge "metricsd: Split out the trait name from the command name" am: c480b8e6dd
...
am: 6d2c274520
* commit '6d2c274520153fc3dfa7902200921c0938ab16f7':
metricsd: Split out the trait name from the command name
2016-01-08 22:07:38 +00:00
Alex Vakulenko
6d2c274520
Merge "metricsd: Split out the trait name from the command name"
...
am: c480b8e6dd
* commit 'c480b8e6dd8a18566b391a9893436311452027c1':
metricsd: Split out the trait name from the command name
2016-01-08 22:05:25 +00:00
Alex Vakulenko
c480b8e6dd
Merge "metricsd: Split out the trait name from the command name"
2016-01-08 22:00:35 +00:00
Alex Vakulenko
e06cdcccb1
Merge "metrics: Switch to use Binder interface to weaved" am: b50bc6b360
...
am: c83a5aefd6
* commit 'c83a5aefd619b8808c2c1a390ec3ad337f982a7c':
metrics: Switch to use Binder interface to weaved
2016-01-08 21:57:04 +00:00
Alex Vakulenko
c83a5aefd6
Merge "metrics: Switch to use Binder interface to weaved"
...
am: b50bc6b360
* commit 'b50bc6b36007c567a097bd59f24ad1518e49923a':
metrics: Switch to use Binder interface to weaved
2016-01-08 21:55:04 +00:00
Alex Vakulenko
ba95a94e3e
metricsd: Split out the trait name from the command name
...
weaved::Service::AddCommandHandler() and SetStateProperty() now
expect the trait name as a separate argument.
BUG: 26443877
Change-Id: I2ad587d984375a7ebd70c7dc804b446b66d6be1b
2016-01-08 13:51:15 -08:00
Alex Vakulenko
b50bc6b360
Merge "metrics: Switch to use Binder interface to weaved"
2016-01-08 21:50:07 +00:00
Jorge Lucangeli Obes
218eb7c820
adbd: Depend only on libminijail.
...
With https://android-review.googlesource.com/#/c/195460 ,
adbd can depend only on libminijail, without having to include its
dependencies.
Bug: 26099611
Change-Id: I2312d8584dda88b4a4619d3100d0983fa2833ba5
2016-01-08 13:33:01 -08:00
Colin Cross
2dfa4fb571
Merge "debuggerd_test: provide stub selinux/android.h" am: 5e19382e1c
...
am: ce93dd6fcc
* commit 'ce93dd6fcc36de6439843472e60a0f0f3d336712':
debuggerd_test: provide stub selinux/android.h
2016-01-08 20:57:25 +00:00
Colin Cross
51aaecea35
Merge "libinit: depend on libselinux" am: 710056efb8
...
am: f97f11f8c1
* commit 'f97f11f8c14e3efbd3e3840ba8ba1ea8c027e8f7':
libinit: depend on libselinux
2016-01-08 20:57:18 +00:00
Colin Cross
ce93dd6fcc
Merge "debuggerd_test: provide stub selinux/android.h"
...
am: 5e19382e1c
* commit '5e19382e1c585967ee07b14fbb36a8027c92c394':
debuggerd_test: provide stub selinux/android.h
2016-01-08 20:54:20 +00:00
Bertrand Simonnet
530c8c75e2
Merge "init: Allows shutting down cleanly." am: f9f4ee8b72
...
am: a8c931b7f5
* commit 'a8c931b7f57c8ce74f520d591e99bb367f91dc81':
init: Allows shutting down cleanly.
2016-01-08 20:54:11 +00:00
Colin Cross
f97f11f8c1
Merge "libinit: depend on libselinux"
...
am: 710056efb8
* commit '710056efb8951f6cc48e5d219ca0d561c4dafc11':
libinit: depend on libselinux
2016-01-08 20:54:11 +00:00
Bertrand Simonnet
a8c931b7f5
Merge "init: Allows shutting down cleanly."
...
am: f9f4ee8b72
* commit 'f9f4ee8b720c0431669c63bd684626a0e4e9ff51':
init: Allows shutting down cleanly.
2016-01-08 20:52:15 +00:00
Colin Cross
5e19382e1c
Merge "debuggerd_test: provide stub selinux/android.h"
2016-01-08 20:49:47 +00:00
Colin Cross
710056efb8
Merge "libinit: depend on libselinux"
2016-01-08 20:49:42 +00:00