Colin Cross
df41d4f2a3
Merge "Add test config for memunreachable_test" am: a6bee4a29e
...
am: 2abcc0a178
2017-07-07 04:20:37 +00:00
Colin Cross
2abcc0a178
Merge "Add test config for memunreachable_test"
...
am: a6bee4a29e
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
2a0f067126
Merge "Remove reference to deleted gzip module" am: 48d610ab18
...
am: 55665c3c97
2017-07-07 01:45:46 +00:00
Colin Cross
55665c3c97
Merge "Remove reference to deleted gzip module"
...
am: 48d610ab18
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)
bb3d4e579c
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
2017-07-06 23:51:55 +00:00
Android Build Merger (Role)
b3341eef52
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
2017-07-06 23:51:34 +00:00
Steven Moreland
18114a6493
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
...
am: b3c418e847
2017-07-06 23:51:26 +00:00
Steven Moreland
2ae838ed16
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
...
am: b3c418e847
2017-07-06 23:51:07 +00:00
Android Build Merger (Role)
7f895b1438
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp
2017-07-06 23:51:02 +00:00
Steven Moreland
a947566568
Merge "Move libnativebridge headers into the module." am: 508e0b8b34
...
am: 1921ab7c0e
2017-07-06 23:50:33 +00:00
Steven Moreland
d46cb65ce4
Merge "Move libnativebridge headers into the module." am: 508e0b8b34
...
am: 1921ab7c0e
2017-07-06 23:50:18 +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
2017-07-06 23:47:31 +00:00
Steven Moreland
1921ab7c0e
Merge "Move libnativebridge headers into the module."
...
am: 508e0b8b34
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
19fc21698b
Merge "System/core: Remove include/ziparchive" am: ae590fe723
...
am: 10e80f3715
2017-07-06 23:10:24 +00:00
Andreas Gampe
10e80f3715
Merge "System/core: Remove include/ziparchive"
...
am: ae590fe723
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
417556a5f8
Merge "Libziparchive: Export headers in defaults" am: c31963b5c2
...
am: bf4029cdfb
2017-07-06 07:00:13 +00:00
Andreas Gampe
bf4029cdfb
Merge "Libziparchive: Export headers in defaults"
...
am: c31963b5c2
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
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
7b600f8012
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
...
am: 11d5611ba5
2017-07-06 04:51:08 +00:00
Tom Cherry
11d5611ba5
Merge "init: add info logs in first stage mount if we have to poll"
...
am: 6a9d56775f
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
0ac18b28cd
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368
...
am: 694985721f
2017-07-06 04:22:08 +00:00
Jinguang Dong
694985721f
Merge "fs_mgr: Adding logs when failing to wait for a device file"
...
am: 4ca2a30368
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
Tom Cherry
177fec0899
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
...
am: 3752ae8474
2017-07-06 02:23:20 +00:00
Android Build Merger (Role)
1a4bc908f2
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp
2017-07-06 02:21:45 +00:00
Tom Cherry
290b501bc0
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
2017-07-06 02:21:34 +00:00
Tom Cherry
1eee2122ca
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
2017-07-06 02:21:26 +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
2017-07-06 02:11:03 +00:00
Tom Cherry
e944b7e0a4
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
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
Android Build Merger (Role)
61ce9b3bad
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp
2017-07-06 00:57:11 +00:00
Keun-young Park
2fb50a7394
Merge "add "shutdown critical" to service" am: b3915d113d
...
am: a4ad5d0328
2017-07-06 00:56:58 +00:00
Keun-young Park
19ec8e7bcf
Merge "add "shutdown critical" to service" am: b3915d113d
...
am: a4ad5d0328
2017-07-06 00:56:18 +00:00
Bowgo Tsai
06c6bf67e9
Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962
...
am: 328b56585e
2017-07-06 00:56:00 +00:00
Keun-young Park
a4ad5d0328
Merge "add "shutdown critical" to service"
...
am: b3915d113d
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
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
