Commit Graph

35143 Commits

Author SHA1 Message Date
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) 158803cd39 Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:46 +00:00
Tom Cherry cb82e501d4 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82
am: 04b7493074

Change-Id: Id4b36cb07732686dba28fd6b129ec8a05097613b
2017-07-05 23:38:34 +00:00
Android Build Merger (Role) 501d7a1360 Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:24 +00:00
Android Build Merger (Role) cdc83336bb Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:18 +00:00
Tom Cherry ff1735b966 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82
am: 04b7493074

Change-Id: I17b896b07a4d3d8d19fcd108f82da48e990a1177
2017-07-05 23:38:07 +00:00
Tom Cherry 536766da6b Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b
am: bef2bbdf62

Change-Id: I6066c897ca4dce702c96ea7c9c0127505e478bfa
2017-07-05 23:38:01 +00:00
Android Build Merger (Role) 93e81d4775 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:01 +00:00
Android Build Merger (Role) 3dcfd2e6ad Merge "Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f am: 419a9ef8f1" into oc-dr1-dev-plus-aosp 2017-07-05 23:37:54 +00:00
Tom Cherry 07999f8677 Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b
am: bef2bbdf62

Change-Id: Ice5ec0702cbdae53d7a78bceb7a24e923a488319
2017-07-05 23:37:46 +00:00
Tom Cherry 85bccd3bd0 Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f
am: 419a9ef8f1

Change-Id: I3b9dcfaf7077218d011149a4218b6a582296f62f
2017-07-05 23:37:42 +00:00
Tom Cherry fc479afbb6 Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f
am: 419a9ef8f1

Change-Id: I0f2e6b2b2dfed4dab480acf2562df78da8d2f65e
2017-07-05 23:37:21 +00:00
Tom Cherry 04b7493074 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master
am: f038ee0d82

Change-Id: I4de99eac06e1b32820a9d1e5dde645c6e26e28cd
2017-07-05 23:02:47 +00:00
Tom Cherry bef2bbdf62 Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f
am: 6e0b51825b

Change-Id: Ic31e720cd9014de76f0fd999af44ce3c3ffcd482
2017-07-05 23:01:53 +00:00
Tom Cherry 419a9ef8f1 Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35
am: 0924b32c1f

Change-Id: I18a3c9a9a96a2488c7714113175f3e8115bd697f
2017-07-05 23:01:35 +00: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
Android Build Merger (Role) 06a1ece4d4 Merge "Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev am: 5c5c544e80" into oc-dr1-dev-plus-aosp 2017-07-05 22:41:56 +00:00
Tom Cherry f3ae82f57f Merge "ueventd: remove character device symlinks (/dev/usb/*)" 2017-07-05 22:41:55 +00:00
Jin Qian 367baf4502 Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev
am: 5c5c544e80

Change-Id: Id2ca6fe04016495ebdb7b1efd7b51f16b615aaca
2017-07-05 22:41:02 +00:00
Jin Qian 3ca00a3c98 Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev
am: 5c5c544e80

Change-Id: Ifee5b6516fe3aee03df845a46421753295cbc740
2017-07-05 22:40:42 +00:00
Tom Cherry a51c40ce35 Merge "init: reap zombies only after kill(-pid, ...)" 2017-07-05 22:39:51 +00:00
TreeHugger Robot 5c5c544e80 Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev 2017-07-05 22:33:35 +00:00
Mark Salyzyn 0c7862b805 Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938 am: eef732555d
am: ab6f80c350

Change-Id: I1dcef448c82402404652921f8113b2a576158f57
2017-07-05 21:58:15 +00:00
Mark Salyzyn ab6f80c350 Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938
am: eef732555d

Change-Id: I1d3566cf0de8b2d695cee26effc12c04a53ae2b3
2017-07-05 21:56:15 +00:00
Keun-young Park cccb34fce8 add "shutdown critical" to service
- "shutdown critical" prevents killing the service during
  shutdown. And the service will be started if not running.
- Without it, services will be killed by SIGTERM / SIGKILL during shutdown.
- Even services with "shutdown critical" will be killed if shutdown
  times out.
- Removes ueventd and vold from hard coded list. Each service's rc will
  be updated to add "shutdown critical". watchdogd is still kept in the list.

bug: 37626581
Test: reboot and check last kmsg

Change-Id: Ie8cc699d1efbc59b9a2561bdd40fec64aed5a4bb
2017-07-05 14:55:22 -07:00
Mark Salyzyn eef732555d Merge "fs_mgr: report errno string for __mount errors"
am: 6333cd0938

Change-Id: Ic3c85f6ed01d5edd2bfd0a29063610b4d8159f31
2017-07-05 21:54:17 +00:00
Wei Wang eeab491efd init: Support custom shutdown actions
We have been seeing panics and errors during shutdown sequence in
some vendor's platform, and it is required to disable error handling
during shutdown.

This CL separates the shutdown request to execute another "shutdown"
trigger at the beginning of shutdown stage. And vendor can use this
trigger to add custom commands needed for shutting down gracefully.

Bug: 38203024
Bug: 62084631
Test: device reboot/shutdown
Change-Id: I3fac4ed59f06667d86e477ee55ed391cf113717f
2017-07-05 14:49:57 -07:00
Treehugger Robot 6333cd0938 Merge "fs_mgr: report errno string for __mount errors" 2017-07-05 21:41:51 +00:00
Tom Cherry 322e176f6a init: add info logs in first stage mount if we have to poll
It's not a error case if we do not find a device that we're attempting
to regenerate uevents for during first stage mount, but it is likely
to increase boot time, so we log a message to attribute this delay.

Bug: 63327193
Test: Boot bullhead, sailfish

Change-Id: I97c2e5aefd218bbdd87717ff3c375381f725de08
2017-07-05 14:05:03 -07:00
Logan Chien b0bff4a55c Revert "Move libz to vndk-sp"
am: f499bcdde7

Change-Id: I7f641efd4c8e88289496507c7f940db9ea60f745
2017-07-05 13:16:22 +00:00
Bowgo Tsai d1fe3bdbd6 fs_mgr: allow no verity metadata when the device is unlocked.
To boot with generic system.img for project Treble, we should allow no verity
metadata when the device is unlocked. The previous fix checks system property
"ro.boot.flash.locked" but it's unavailable during first stage mount.
This CL checks "androidboot.verifiedbootstate" in kernel command line instead.

Bug: 63268209
Test: boot sailfish without metadata on /vendor

Change-Id: Ifd1dbeb2a2f09cd06903ecdd59bc94b3905a3fbd
2017-07-05 17:22:35 +08:00
Logan Chien f499bcdde7 Revert "Move libz to vndk-sp"
This commit removes libz.so from the exported libs of "vndk" linker
namespace and export libz.so from "default" linker namespace instead.

We have to remove libz.so from vndk-sp because we don't have a good
mechanism to stop "classloader" linker namespace from loading
/system/lib[64]/vndk-sp/libz.so.  Other alternatives require significant
changes to dynamic linker or CTS test cases.

Let's temporarily revert the commit to fix b/62195853 for oc-dr1-dev.
The long-term solution will be discussed in b/37617391.

This reverts commit 63226400f3.

Bug: 62195853
Bug: 37617391
Test: Boot sailfish to home screen.
Change-Id: I4a97819b080f7091b633152d4a11353b24c463ee
2017-07-05 11:18:13 +08:00
Andreas Gampe 8f0947c11f Backtrace: Add libziparchive dependency
Bug: 37342627
Test: m
Change-Id: I2b4155bd11b315ff49eb9a69549e1ab3678d0b28
2017-07-04 12:03:52 -07:00
Jiyong Park c97952a2d3 Merge "zlib is not exposed to libziparchive headers" am: eb42bb8c8b am: d74d572f9d
am: 022b164c77

Change-Id: I452621490c61bb7ab49465a7526c5f0b20547c99
2017-07-03 19:41:27 +00:00
Jiyong Park 022b164c77 Merge "zlib is not exposed to libziparchive headers" am: eb42bb8c8b
am: d74d572f9d

Change-Id: Ie544d690f230581559ad5e634ee24d03801f7ea5
2017-07-03 19:38:25 +00:00
Jiyong Park d74d572f9d Merge "zlib is not exposed to libziparchive headers"
am: eb42bb8c8b

Change-Id: Iaa99279d773725ffb2000da4f1bb2f111bc23d82
2017-07-03 19:34:56 +00:00
Treehugger Robot eb42bb8c8b Merge "zlib is not exposed to libziparchive headers" 2017-07-03 19:30:45 +00:00
Jiyong Park e7cf680ccc zlib is not exposed to libziparchive headers
By forward-declaring zstream, we don't need to re-export zlib headers.

Bug: 37342627
Test: build
Test: BOARD_VNDK_VERSION=current m -j dumpstate (or any other module
using libziparchive)

Change-Id: Ia69e5d459c79878d491cfe4ca21a7cc8fed4a5d8
2017-07-03 17:44:07 +00:00
Jiyong Park a55bf0970d Merge "libziparchive headers are moved to local directory" am: 7b44858b91 am: 4724e91dad
am: da3af937a1

Change-Id: Id24f61623f260a77adb720d23e5f7ffe25410917
2017-07-03 08:18:20 +00:00
Jiyong Park da3af937a1 Merge "libziparchive headers are moved to local directory" am: 7b44858b91
am: 4724e91dad

Change-Id: I64400ffb9578be19d187e02efb6ef9204af783cf
2017-07-03 08:15:20 +00:00
Jiyong Park 4724e91dad Merge "libziparchive headers are moved to local directory"
am: 7b44858b91

Change-Id: I77e446012003528ae4180f8450bc96563259f34f
2017-07-03 08:12:51 +00:00
Treehugger Robot 7b44858b91 Merge "libziparchive headers are moved to local directory" 2017-07-03 08:06:40 +00:00
Jiyong Park 55b896f1e5 Merge "Ran clang-format on libziparchive sources and headers" am: aa82721894 am: 1fd5216370
am: b84d631915

Change-Id: I25f310f90c956ab5702d3e3487e911160922a25d
2017-07-03 00:54:56 +00:00
Jiyong Park b84d631915 Merge "Ran clang-format on libziparchive sources and headers" am: aa82721894
am: 1fd5216370

Change-Id: I24362dbd4aa00ef2cb9c6a5ffebbe67d5bad2df6
2017-07-03 00:52:26 +00:00
Jiyong Park 1fd5216370 Merge "Ran clang-format on libziparchive sources and headers"
am: aa82721894

Change-Id: I04d2e03437ea1ada667c9fcc7b6e633a0c13712f
2017-07-03 00:49:56 +00:00
Treehugger Robot aa82721894 Merge "Ran clang-format on libziparchive sources and headers" 2017-07-03 00:45:16 +00:00
Jiyong Park cdf7ff8e20 libziparchive headers are moved to local directory
libziparchive headers are moved from the global include directory
(/system/core/include) to the local directory inside libziparchive.

Note: /system/core/include/ziparchive still exists as a symlink to
libarchive/include/ziparchive. This will be removed when there is no
header-only dependency to libziparchive.

Bug: 37342627
Test: build
Change-Id: I3631ffc2df7be8a064d64a625d10436090c3bb0f
2017-07-02 04:33:34 +00:00