Elliott Hughes
4d7fbc3923
Merge "Use hasmntopt(3) rather than reinventing the wheel." am: 769a5a1962
am: 8656ed109b
...
am: 5dd53bf466
Change-Id: If2f24ff3a631a777cf9416166746d15d0a1379e2
2016-11-30 23:06:30 +00:00
Elliott Hughes
5dd53bf466
Merge "Use hasmntopt(3) rather than reinventing the wheel." am: 769a5a1962
...
am: 8656ed109b
Change-Id: Ied4c404b0d0f957bfe0e9ff3841173b52147b21b
2016-11-30 22:56:00 +00:00
Elliott Hughes
8656ed109b
Merge "Use hasmntopt(3) rather than reinventing the wheel."
...
am: 769a5a1962
Change-Id: I62541c0ff6961888239a7686bb37115b39fc787b
2016-11-30 22:49:53 +00:00
Elliott Hughes
769a5a1962
Merge "Use hasmntopt(3) rather than reinventing the wheel."
2016-11-30 22:32:44 +00:00
Android Build Merger (Role)
e42440f189
Merge "init: Fix sync issue on property trigger. am: 876ad4571e
am: c86dbc9a07" into nyc-mr2-dev-plus-aosp
2016-11-30 19:17:57 +00:00
caozhiyuan
ad5c8f22c5
init: Fix sync issue on property trigger. am: 876ad4571e
...
am: 3353d2a03c
Change-Id: I563ada2b40d0bfa0379ae24d92fd649ab7a04dd1
2016-11-30 19:17:46 +00:00
caozhiyuan
c89b04a9ba
init: Fix sync issue on property trigger. am: 876ad4571e
...
am: c86dbc9a07
Change-Id: I1366412b54b27d7f31111325d51278ed8104fbb4
2016-11-30 19:17:46 +00:00
caozhiyuan
3353d2a03c
init: Fix sync issue on property trigger.
...
am: 876ad4571e
Change-Id: I8a53c4728ee74a18b47b3ae8d9db6050b83ce6e2
2016-11-30 19:12:19 +00:00
caozhiyuan
c86dbc9a07
init: Fix sync issue on property trigger.
...
am: 876ad4571e
Change-Id: Ie5958255e4a785c951cc04e47d139fe1ae719139
2016-11-30 19:12:14 +00:00
Pirama Arumuga Nainar
308594f471
Merge "Statically link LLVM libraries into backtrace_test" am: 9e8467a070
am: 66d86967bd
...
am: 4c11b152ba
Change-Id: I3d8377ef6248f19aec24718e7c3ff7fab88aa71b
2016-11-30 18:46:19 +00:00
Pirama Arumuga Nainar
7ed1ccbcd8
Statically link LLVM libraries into backtrace_test am: c198b150d4
am: 473f17cde0
...
am: a16735e36c
Change-Id: I5f882891c38ccc9841dc494a45eff06d2111a179
2016-11-30 18:46:03 +00:00
Pirama Arumuga Nainar
4c11b152ba
Merge "Statically link LLVM libraries into backtrace_test" am: 9e8467a070
...
am: 66d86967bd
Change-Id: Ia7973b59db8706fc6540003464ba4f79c99342d1
2016-11-30 18:41:47 +00:00
Pirama Arumuga Nainar
a16735e36c
Statically link LLVM libraries into backtrace_test am: c198b150d4
...
am: 473f17cde0
Change-Id: I74a7c804446fed86a9c9f401f054ab8387d1b456
2016-11-30 18:41:32 +00:00
Pirama Arumuga Nainar
66d86967bd
Merge "Statically link LLVM libraries into backtrace_test"
...
am: 9e8467a070
Change-Id: Iddd06215b4a696283f645080d4183dd524827af4
2016-11-30 18:36:16 +00:00
Pirama Arumuga Nainar
473f17cde0
Statically link LLVM libraries into backtrace_test
...
am: c198b150d4
Change-Id: I5d0db1329ac17a2a59cac589b9ab34c909f903ea
2016-11-30 18:36:14 +00:00
Treehugger Robot
9e8467a070
Merge "Statically link LLVM libraries into backtrace_test"
2016-11-30 18:27:39 +00:00
Elliott Hughes
15c25fbed4
Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf
am: 65016074c2
...
am: b94063edbf
Change-Id: I65c9d1b2e17550d73a6a45d44e6094d79956524b
2016-11-30 18:04:41 +00:00
Elliott Hughes
b94063edbf
Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf
...
am: 65016074c2
Change-Id: I72dda41a53e95420653027176b04c7d359fa8e71
2016-11-30 18:00:11 +00:00
Elliott Hughes
65016074c2
Merge "init: Fix sync issue on property trigger."
...
am: 80d2f01fbf
Change-Id: Iae57b79abeb7a372c0e483316d328d5307c66b73
2016-11-30 17:54:31 +00:00
caozhiyuan
876ad4571e
init: Fix sync issue on property trigger.
...
This issue reproduces in the following senario.
1. ("", "") is added to queue;
2. property_triggers_enabled is set to 1;
3. user defined property is triggered, like sys.usb.config=adb;
4. ("sys.usb.config", "adb") is added to queue;
5. main loop interpret ("", "") and queue all current triggers to execution,
so ("sys.usb.config", "adb") is queued for execution for the first time.
6. main loop interpret ("sys.usb.config", "adb"), it is queued for
execution for a second time.
The second time makes ASIT fail.
(cherry pick from AOSP commit b104c502e1
)
Bug: http://b/28218187
Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2016-11-30 09:51:38 -08:00
Pirama Arumuga Nainar
c198b150d4
Statically link LLVM libraries into backtrace_test
...
Bug: http://b/28866258
Remove dependency of backtrace_test on libLLVM. Also clean up
specification for libbacktrace_offline module. Since it is a static
library now, dependencies are only needed to automatically include
necessary headers.
Test: 32-bit and 64-bit backtrace_test passes on host and on Angler.
mma in system/extras/simpleperf, cts/tests/tests/simpleperf
m test-art-host
Change-Id: I76b0db14d067fa7b140a99edd237370ac04fe873
2016-11-30 17:43:20 +00:00
Elliott Hughes
80d2f01fbf
Merge "init: Fix sync issue on property trigger."
2016-11-30 17:39:55 +00:00
Mark Salyzyn
7df147f3bb
Merge "libcutils: tests" am: bac388e424
am: 6878cd20e6
...
am: 2e88b5c803
Change-Id: I6c92f70db15eb2e44f8e9a2ae255d6c4945b7c9f
2016-11-30 17:39:04 +00:00
Elliott Hughes
8c1838823a
Use hasmntopt(3) rather than reinventing the wheel.
...
Bug: N/A
Test: "power off" still works
Change-Id: I11d3dc22f98ac71608c9929a3fd43319c787d49e
2016-11-30 09:37:17 -08:00
Mark Salyzyn
2e88b5c803
Merge "libcutils: tests" am: bac388e424
...
am: 6878cd20e6
Change-Id: I11758ee49eec3e19a5b9484af7c986eb3f3de769
2016-11-30 17:34:10 +00:00
Mark Salyzyn
6878cd20e6
Merge "libcutils: tests"
...
am: bac388e424
Change-Id: I86a00ea257985836400b530c1e60bdc5e070dd00
2016-11-30 17:28:39 +00:00
Treehugger Robot
bac388e424
Merge "libcutils: tests"
2016-11-30 17:21:46 +00:00
Oleksiy Avramchenko
79f7c9ca43
Merge "logcat: Fix --last usage option typo" am: 95a53b8b7a
am: 8a96f5e4a7
...
am: ac7bdd6a07
Change-Id: I0490d5194ecf223969b8baa95b8d61381bfbeed4
2016-11-30 17:12:39 +00:00
Oleksiy Avramchenko
ac7bdd6a07
Merge "logcat: Fix --last usage option typo" am: 95a53b8b7a
...
am: 8a96f5e4a7
Change-Id: I458817e1ba2407bb35d0d9dc5c9c913f40bab6d5
2016-11-30 17:07:07 +00:00
Oleksiy Avramchenko
8a96f5e4a7
Merge "logcat: Fix --last usage option typo"
...
am: 95a53b8b7a
Change-Id: Ic18c2cec4c72cd97353c22f9e41c926baac8085b
2016-11-30 17:01:37 +00:00
Treehugger Robot
95a53b8b7a
Merge "logcat: Fix --last usage option typo"
2016-11-30 16:55:23 +00:00
Mark Salyzyn
e81915ee89
Merge "liblog: CTS test" am: f1f7333e7c
am: 815e0bd6fa
...
am: 6e69c8fea6
Change-Id: Ia83079e8296c3b4bcff6f93ed8a14618fa296dd2
2016-11-30 16:45:07 +00:00
Mark Salyzyn
6e69c8fea6
Merge "liblog: CTS test" am: f1f7333e7c
...
am: 815e0bd6fa
Change-Id: I1e33427d08b02c4128341ac98c3ce584db694b4f
2016-11-30 16:39:06 +00:00
Mark Salyzyn
815e0bd6fa
Merge "liblog: CTS test"
...
am: f1f7333e7c
Change-Id: I400e7c1aa53fd431102bff843e672ee1fe49e8f7
2016-11-30 16:34:05 +00:00
Treehugger Robot
f1f7333e7c
Merge "liblog: CTS test"
2016-11-30 16:25:11 +00:00
Mark Salyzyn
72b701449c
Merge "liblog: event_tag_map benchmark" am: 4afb3ef952
am: 6b4a2ec603
...
am: 966b078715
Change-Id: Ib56cbd7b060484cfe56d65cc425a4109ef3ffd31
2016-11-30 15:49:03 +00:00
Mark Salyzyn
966b078715
Merge "liblog: event_tag_map benchmark" am: 4afb3ef952
...
am: 6b4a2ec603
Change-Id: I0cdf5e13ec1c291d4dba1bf06f7df538c8389f53
2016-11-30 15:43:03 +00:00
Mark Salyzyn
6b4a2ec603
Merge "liblog: event_tag_map benchmark"
...
am: 4afb3ef952
Change-Id: I986ef28441dc87f2ade0fd50ffceeb0a4beddf88
2016-11-30 15:37:33 +00:00
Treehugger Robot
4afb3ef952
Merge "liblog: event_tag_map benchmark"
2016-11-30 15:31:11 +00:00
Oleksiy Avramchenko
39e2d22b93
logcat: Fix --last usage option typo
...
Test: mm
Change-Id: I0b7a1615857acd4cd467f1ff1752eeae86d84eca
2016-11-30 13:42:14 +01:00
Nick Kralevich
df9b817177
Merge "ion.c: add O_CLOEXEC to /dev/ion open" am: d91e35fb09
am: 84ccb2dbe0
...
am: 376aa73945
Change-Id: I94067e2846c7ebcd422d8200164f8bea81748eb7
2016-11-30 09:29:40 +00:00
Richard Uhler
75eea836bf
Merge "debuggerd: Dump list of open files on process crash." am: b675f7cd32
am: 3ff028c7db
...
am: 8035a63a38
Change-Id: Ic7c4d23b103a652947d01c4ebb5b43845c8f1e0e
2016-11-30 09:29:26 +00:00
Nick Kralevich
376aa73945
Merge "ion.c: add O_CLOEXEC to /dev/ion open" am: d91e35fb09
...
am: 84ccb2dbe0
Change-Id: I87dea345156be3f0745e4df513b725fa451823b3
2016-11-30 09:24:14 +00:00
Richard Uhler
8035a63a38
Merge "debuggerd: Dump list of open files on process crash." am: b675f7cd32
...
am: 3ff028c7db
Change-Id: If0dae1f04f63d113f6414e21bcceee751f7de5c9
2016-11-30 09:23:56 +00:00
Nick Kralevich
84ccb2dbe0
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
...
am: d91e35fb09
Change-Id: I97fcb4d10ae1a724fc24588f1ee3b0e783d40a62
2016-11-30 09:19:16 +00:00
Richard Uhler
3ff028c7db
Merge "debuggerd: Dump list of open files on process crash."
...
am: b675f7cd32
Change-Id: Iec231fc7eb57fa2c51aabc0fb75b4a09c47004cd
2016-11-30 09:18:57 +00:00
Treehugger Robot
d91e35fb09
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
2016-11-30 07:54:48 +00:00
Treehugger Robot
b675f7cd32
Merge "debuggerd: Dump list of open files on process crash."
2016-11-30 07:53:09 +00:00
Dan Willemsen
d92abae3f0
Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641
am: 695e6182d3
...
am: fa807c7cad
Change-Id: I9ece6f1ce09097d93fe46d07c323c4dd6977839d
2016-11-30 06:17:15 +00:00
Dan Willemsen
dd592909c0
Enable liblog on host bionic am: 0910d2dbb9
am: 32010171bd
...
am: fb1a1dbe6c
Change-Id: Idb398d60741a13e9027a8968c15c413cb1c16439
2016-11-30 06:17:08 +00:00