Christopher Ferris
793ffcbf20
Merge "Add missing test files to compile."
...
am: 32ac9bfd09
Change-Id: Iaf2ebb9f3d39b2e99724b2bed0512b4f0bb3da3c
2017-07-07 21:33:49 +00:00
Christopher Ferris
32ac9bfd09
Merge "Add missing test files to compile."
2017-07-07 21:26:30 +00:00
Christopher Ferris
9744fb2b54
Add missing test files to compile.
...
Bug: 23762183
Test: Ran unit tests.
Change-Id: I8ac43517231d88c68c288800d8ed286daa57bce1
2017-07-07 12:25:23 -07:00
Christopher Ferris
f5b374a8b3
Merge "Init .gnu_debugdata in GetElf()."
...
am: 2d07f72961
Change-Id: I485c6211dfef3b0468dcdd9cf8cc9347b2563231
2017-07-07 19:01:11 +00:00
Christopher Ferris
2d07f72961
Merge "Init .gnu_debugdata in GetElf()."
2017-07-07 18:56:56 +00:00
Android Build Merger (Role)
200d376b75
Merge "Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d" into stage-aosp-master
2017-07-07 17:43:37 +00:00
Yongqin Liu
b1cef7e70b
Merge "bootstat.cpp: update help message for --record_boot_complete"
...
am: f444650d0d
Change-Id: I63801d806f3ab3bc2977ec74ad003f137899c34a
2017-07-07 17:43:27 +00:00
Yongqin Liu
efe27cd2f6
Merge "bootstat.cpp: update help message for --record_boot_complete"
...
am: f444650d0d
Change-Id: Ifecefb1d52188d8a82208097f67302c91e30c93e
2017-07-07 17:43:19 +00:00
Treehugger Robot
f444650d0d
Merge "bootstat.cpp: update help message for --record_boot_complete"
2017-07-07 17:27:05 +00:00
Yongqin Liu
78b2b94d1d
bootstat.cpp: update help message for --record_boot_complete
...
add description about --record_boot_complete in the help
Test: manually with HiKey
Change-Id: I521d6f5b9d98113c006fc6ab146b6c353ce2390c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-07-07 15:27:10 +00:00
Colin Cross
2abcc0a178
Merge "Add test config for memunreachable_test"
...
am: a6bee4a29e
Change-Id: I90ae7480d84a77143f63d0f5527392a9b0021bb7
2017-07-07 04:17:59 +00:00
Treehugger Robot
a6bee4a29e
Merge "Add test config for memunreachable_test"
2017-07-07 04:11:22 +00:00
Colin Cross
55665c3c97
Merge "Remove reference to deleted gzip module"
...
am: 48d610ab18
Change-Id: I5be86c2fb388df0e651c089040adc9be2580f4d6
2017-07-07 01:44:05 +00:00
Treehugger Robot
48d610ab18
Merge "Remove reference to deleted gzip module"
2017-07-07 01:34:40 +00:00
Colin Cross
b9e74ba400
Add test config for memunreachable_test
...
Test: none
Change-Id: Ieb297a2fcece6365a074cd470b3ca56e2baea926
2017-07-07 01:07:05 +00:00
Android Build Merger (Role)
b3c418e847
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
2017-07-06 23:47:59 +00:00
Steven Moreland
a931c8aee5
Merge "Move libnativebridge headers into the module."
...
am: 508e0b8b34
Change-Id: Ifb3e84ed0a059f10efe8e25595387a17c2b0ed46
2017-07-06 23:47:31 +00:00
Steven Moreland
1921ab7c0e
Merge "Move libnativebridge headers into the module."
...
am: 508e0b8b34
Change-Id: I9135de5cbda05c9b4b686b0c6dda26c2d561d31e
2017-07-06 23:46:57 +00:00
Treehugger Robot
508e0b8b34
Merge "Move libnativebridge headers into the module."
2017-07-06 23:36:34 +00:00
Andreas Gampe
10e80f3715
Merge "System/core: Remove include/ziparchive"
...
am: ae590fe723
Change-Id: I396b3cd0e642b3d65a1e0771a4ed8aec64128922
2017-07-06 22:56:34 +00:00
Treehugger Robot
ae590fe723
Merge "System/core: Remove include/ziparchive"
2017-07-06 22:42:39 +00:00
Colin Cross
73c2ef4b87
Remove reference to deleted gzip module
...
The gzip module was removed and replaced with an implementation in
toybox. Remove the required modules reference.
Bug: 63400769
Change-Id: I032d7ddc59105b3c6fb87084983266655772756a
Test: m -j checkbuild
2017-07-06 22:33:22 +00:00
Steven Moreland
b2b88e35ea
Move libnativebridge headers into the module.
...
Test: links
Change-Id: I2e19d1ba7845b4b3d3fee934fcb1c90151fd7192
2017-07-06 11:23:16 -07:00
Andreas Gampe
bf4029cdfb
Merge "Libziparchive: Export headers in defaults"
...
am: c31963b5c2
Change-Id: Ic57c6374d94828d245b3e89ea6ec669707e32262
2017-07-06 06:57:06 +00:00
Treehugger Robot
c31963b5c2
Merge "Libziparchive: Export headers in defaults"
2017-07-06 06:51:29 +00:00
Andreas Gampe
d201b292fd
System/core: Remove include/ziparchive
...
Remove the now unnecessary link.
Partially reverts commit cdf7ff8e20 .
Bug: 37342627
Test: m
Change-Id: Ia44df234923c798618d7dc79d8f9f9432fbfada9
2017-07-05 22:03:44 -07:00
Andreas Gampe
a10a7e7114
Libziparchive: Export headers in defaults
...
libziparchive-host needs to include the headers correctly, too.
Bug: 37342627
Test: mmma system/core/libziparchive
Change-Id: I88a6d38ff9e494273040f9b913c71bccdda117ad
2017-07-05 22:03:44 -07:00
Tom Cherry
11d5611ba5
Merge "init: add info logs in first stage mount if we have to poll"
...
am: 6a9d56775f
Change-Id: I7948db4cf1d6af6f4e6d0ddb2a2788f62317126f
2017-07-06 04:48:38 +00:00
Treehugger Robot
6a9d56775f
Merge "init: add info logs in first stage mount if we have to poll"
2017-07-06 04:46:05 +00:00
Jinguang Dong
694985721f
Merge "fs_mgr: Adding logs when failing to wait for a device file"
...
am: 4ca2a30368
Change-Id: I19ba38a596527a4544437d126c80123381b065b4
2017-07-06 04:20:55 +00:00
Treehugger Robot
4ca2a30368
Merge "fs_mgr: Adding logs when failing to wait for a device file"
2017-07-06 04:19:00 +00:00
Android Build Merger (Role)
3752ae8474
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
2017-07-06 02:11:15 +00:00
Tom Cherry
1f30993247
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
Change-Id: I4a5957d18e3a934213170279f59b3ec8c0f85090
2017-07-06 02:11:03 +00:00
Tom Cherry
e944b7e0a4
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
Change-Id: I2a40b76e937853fd2f1eed61cc0fe4f6fa465ba2
2017-07-06 02:10:57 +00:00
Tom Cherry
0f4fb5497a
Merge "ueventd: don't double fork firmware handlers"
2017-07-06 02:02:33 +00:00
Jinguang Dong
9d344969b0
fs_mgr: Adding logs when failing to wait for a device file
...
During mount operations, fs_mgr_wait_for_file() is invoked to
ensure the device file exists before starting to mount it. Adding
logs when the wait fails and also skip mounting as it won't be
successful. Also merge fs_mgr_test_access() and wait_for_file()
as fs_mgr_wait_for_file().
Test: Boot device and manually trigger the timeout issue
Test: Check and confirm whether timeout log info is inside ksmg.
Change-Id: Ide6d7fdca41e03e169e4400f91b7dea327985aaf
2017-07-06 09:51:02 +08:00
Keun-young Park
a4ad5d0328
Merge "add "shutdown critical" to service"
...
am: b3915d113d
Change-Id: I25b6f42478efda7077e00141042a427245393d28
2017-07-06 00:46:31 +00:00
Bowgo Tsai
328b56585e
Merge "fs_mgr: allow no verity metadata when the device is unlocked."
...
am: cd0c2d8962
Change-Id: Icebfb3c34b3c2878c4015f36dafe893c577b40c9
2017-07-06 00:46:09 +00:00
Treehugger Robot
b3915d113d
Merge "add "shutdown critical" to service"
2017-07-06 00:40:55 +00:00
Treehugger Robot
cd0c2d8962
Merge "fs_mgr: allow no verity metadata when the device is unlocked."
2017-07-06 00:29:47 +00:00
Andreas Gampe
1030828a36
Merge "Backtrace: Add libziparchive dependency"
...
am: 69542edfbe
Change-Id: I4514fe90b92486b2730bc453b8f4badfc9466002
2017-07-05 23:58:51 +00:00
Treehugger Robot
69542edfbe
Merge "Backtrace: Add libziparchive dependency"
2017-07-05 23:55:43 +00:00
Wei Wang
5b89535442
Merge "init: Support custom shutdown actions"
...
am: c1bc4241f8
Change-Id: I6bb1789dbc5edbb10f2f4d712e9ca83e6302fdf4
2017-07-05 23:54:56 +00:00
Treehugger Robot
c1bc4241f8
Merge "init: Support custom shutdown actions"
2017-07-05 23:49:41 +00:00
Tom Cherry
0f296e06d6
ueventd: don't double fork firmware handlers
...
ueventd may be asked to handle firmware during the time critical
coldboot process. If we double fork to avoid needing to reap the
firmware handler, then we may add significant delay to this process,
as the first child may not get scheduled quickly enough for waitpid()
to complete without delay.
Bug: 63081260
Test: boot bullhead and sailfish, check that firmwares are loaded,
no zombie ueventd processes remain, and no new errors are shown
Change-Id: I2bac3b1fbc3a58557a00326e491c104656db27ae
2017-07-05 16:41:11 -07:00
Android Build Merger (Role)
f038ee0d82
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master
2017-07-05 22:50:56 +00:00
Tom Cherry
d74886ce10
Merge "ueventd: remove character device symlinks (/dev/usb/*)"
...
am: f3ae82f57f
Change-Id: I50d05fbf94c6b6c7868f349ab708cb51ae25f858
2017-07-05 22:50:46 +00:00
Tom Cherry
6e0b51825b
Merge "ueventd: remove character device symlinks (/dev/usb/*)"
...
am: f3ae82f57f
Change-Id: Ib601af84ed3b186705caaed05706d6b1f3c5746c
2017-07-05 22:50:35 +00:00
Tom Cherry
0924b32c1f
Merge "init: reap zombies only after kill(-pid, ...)"
...
am: a51c40ce35
Change-Id: I4f1b7a05cdff1fe7851b528d0bdeda354011b599
2017-07-05 22:50:17 +00:00
Tom Cherry
f3ae82f57f
Merge "ueventd: remove character device symlinks (/dev/usb/*)"
2017-07-05 22:41:55 +00:00