Jin Qian
d14d7c14cb
fastboot: call mke2fs tools to generate ext4 image
...
Set MKE2FS_CONFIG to empty to use mke2fs default configs
Test: fastboot --wipe-and-use-fbe
Bug: 35219933
Change-Id: Ibc97bb125899e1f1fe820d53709fdb2ab291c171
2017-07-18 11:48:19 -07:00
Jin Qian
e6dfd45f00
init: require e2fsdroid and mke2fs when building init am: 041f849548
...
am: f361c2560c
Change-Id: Ic85298e7340a6e61aeab5cfeadaf4cb7a24ade1f
2017-07-06 21:13:13 +00:00
Jin Qian
f361c2560c
init: require e2fsdroid and mke2fs when building init
...
am: 041f849548
Change-Id: Icf49587d20a210cdcf130aacc25ecbcbfd31f06c
2017-07-06 20:55:36 +00:00
Jin Qian
041f849548
init: require e2fsdroid and mke2fs when building init
...
init calls fs_mgr to format ext4 partitions. This requires
e2fsdroid and mke2fs in /system/bin/
Bug: 35219933
Change-Id: Ia32fe438cd9b9332f8e18e0cbe7f61bd050adcb1
2017-07-06 11:45:06 -07:00
Keun-young Park
73cb79e389
Merge "add "shutdown critical" to service" into oc-dr1-dev am: 3b15f44041
...
am: 53d129cdf5
Change-Id: I428c89527549b8fb9df410274622d19ef38a04b0
2017-07-06 17:24:52 +00:00
Keun-young Park
53d129cdf5
Merge "add "shutdown critical" to service" into oc-dr1-dev
...
am: 3b15f44041
Change-Id: I7b70303637913a43d717bb206a2bd6be82c9781f
2017-07-06 17:22:29 +00:00
Keun-young Park
3b15f44041
Merge "add "shutdown critical" to service" into oc-dr1-dev
2017-07-06 17:14:23 +00:00
Tom Cherry
245b7651cf
Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev am: 7be26793eb
-s ours
...
am: 98562ebdf7
-s ours
Change-Id: I7d5b7724444128f5684be7e059fdcf0ab3c8c7fb
2017-07-06 17:04:34 +00:00
Tom Cherry
98562ebdf7
Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev
...
am: 7be26793eb
-s ours
Change-Id: I369435619caa17d312555453201809892865e842
2017-07-06 16:28:11 +00:00
Android Build Merger (Role)
840428406b
Merge "Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe
-s ours" into oc-dr1-dev-plus-aosp am: 80043c7891
-s ours"
2017-07-06 16:15:44 +00:00
Android Build Merger (Role)
5f93aa23b6
Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe
-s ours am: f5135ce112
-s ours"
2017-07-06 16:15:39 +00:00
TreeHugger Robot
7be26793eb
Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev
2017-07-06 16:15:11 +00:00
Jin Qian
0f151db71d
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe
-s ours
...
am: f5135ce112
-s ours
Change-Id: I904c725f889587ecfecbee2d6b42ed5a168e8c26
2017-07-06 16:14:05 +00:00
Jin Qian
0d3d36dcad
Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe
-s ours" into oc-dr1-dev-plus-aosp
...
am: 80043c7891
-s ours
Change-Id: I4e256675d3299d6f46f3e03b0444ab4de8434f43
2017-07-06 16:13:54 +00:00
Jin Qian
bb2ac0ee06
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe
-s ours
...
am: f5135ce112
-s ours
Change-Id: I34d370ba8009e1322c282a09135675348f45834e
2017-07-06 16:11:54 +00:00
Android Build Merger (Role)
80043c7891
Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe
-s ours" into oc-dr1-dev-plus-aosp
2017-07-06 16:07:55 +00:00
Jin Qian
64ba9e3e49
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev
...
am: 3d7422dbfe
-s ours
Change-Id: I1db69b31974703bd505ecd9bda9a253d887dbf5f
2017-07-06 16:06:38 +00:00
Jin Qian
f5135ce112
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev
...
am: 3d7422dbfe
-s ours
Change-Id: I6e83ad386fff41506b1529b39b2e5074de2fc62f
2017-07-06 16:06:19 +00:00
TreeHugger Robot
3d7422dbfe
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev
2017-07-06 14:24:04 +00:00
Andreas Gampe
2322f6a1e0
Merge "Libziparchive: Export headers in defaults" am: c31963b5c2
am: bf4029cdfb
am: 417556a5f8
...
am: 65dc50f7db
Change-Id: I900d654757457d3b5b24e2475a02fab3663aabf1
2017-07-06 07:05:55 +00:00
Andreas Gampe
65dc50f7db
Merge "Libziparchive: Export headers in defaults" am: c31963b5c2
am: bf4029cdfb
...
am: 417556a5f8
Change-Id: I3b05aea4e31c0f11f5d4fe0e8418aedb9e6cd0e2
2017-07-06 07:03:18 +00:00
Andreas Gampe
417556a5f8
Merge "Libziparchive: Export headers in defaults" am: c31963b5c2
...
am: bf4029cdfb
Change-Id: I9f992d57fd65f341247b02a20d761a1863376fa4
2017-07-06 07:00:13 +00: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
Tom Cherry
c680bfeaf2
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
Merged-In: I97c2e5aefd218bbdd87717ff3c375381f725de08
Change-Id: I97c2e5aefd218bbdd87717ff3c375381f725de08
(cherry picked from commit 322e176f6a
)
2017-07-06 13:04:23 +08: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
e0d1699487
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
am: 11d5611ba5
am: 7b600f8012
...
am: 71ed340d1e
Change-Id: I722d6d71a9505d2b579a4bb9484221b73d71d50b
2017-07-06 04:55:40 +00:00
Tom Cherry
71ed340d1e
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
am: 11d5611ba5
...
am: 7b600f8012
Change-Id: I4abc2b23c0b86059d44965b0139256f7617f48dd
2017-07-06 04:53:38 +00:00
Tom Cherry
7b600f8012
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
...
am: 11d5611ba5
Change-Id: Ib08ea62f6fb13cfaed6bc894bcbc548ccd8c3d55
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
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
d974500314
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368
am: 694985721f
am: 0ac18b28cd
...
am: febf2ad9d7
Change-Id: I8070df926d9949583e84dca03e5dd8acc78c8968
2017-07-06 04:24:38 +00:00
Jinguang Dong
febf2ad9d7
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368
am: 694985721f
...
am: 0ac18b28cd
Change-Id: I055425b0dfdbccbfa9c72e9bb1390ea483afdb9c
2017-07-06 04:23:26 +00:00
Jinguang Dong
0ac18b28cd
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368
...
am: 694985721f
Change-Id: I86f7cf743e1e9f2466eb7675ebc1de61ae9ab3ec
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
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
Tom Cherry
e985505dff
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master am: 3752ae8474
am: 177fec0899
...
am: a4050b871b
Change-Id: Id75d6cce73d407301035c1320aa32cac4ceb5708
2017-07-06 02:53:51 +00:00
Tom Cherry
0f40b8d7b0
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
am: e944b7e0a4" into oc-dev-plus-aosp am: 1a4bc908f2
...
am: f944ba812d
Change-Id: I3b30f9d838707ae9374a369e0517c2fff380f0e0
2017-07-06 02:53:31 +00:00
Tom Cherry
1b5db82fd9
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
am: e944b7e0a4
am: 1eee2122ca
...
am: 7c4b63be8c
Change-Id: I39c17229dd4043da3ed5824b7a13b2d2e8cede4a
2017-07-06 02:53:11 +00:00
Tom Cherry
a4050b871b
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master am: 3752ae8474
...
am: 177fec0899
Change-Id: I0d2e748e61dc7948861fa4c332e3d3647e14dee4
2017-07-06 02:34:30 +00:00
Tom Cherry
f944ba812d
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
am: e944b7e0a4" into oc-dev-plus-aosp
...
am: 1a4bc908f2
Change-Id: I7fa4cf045667d634434ddd06f558a4d98e43be18
2017-07-06 02:34:11 +00:00
Tom Cherry
7c4b63be8c
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
am: e944b7e0a4
...
am: 1eee2122ca
Change-Id: I726a412b0b01c4f829847b8ebdef97be4df5abef
2017-07-06 02:33:52 +00:00
Tom Cherry
177fec0899
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
...
am: 3752ae8474
Change-Id: Id88c3f665131cafd5d7d3d8fc0159997d92130f0
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
Change-Id: I530a79b39eefddcf398932a90dfd0059bf8a096e
2017-07-06 02:21:34 +00:00
Tom Cherry
1eee2122ca
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
Change-Id: Ifc8c586aa3b06ecb42bf20284c461b4b7c159bc7
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
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