aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorYi-Yo Chiang <yochiang@google.com>2021-04-20 19:39:25 +0800
committerYi-Yo Chiang <yochiang@google.com>2021-04-22 20:01:57 +0800
commit24c68568b6a3fe08009789ba4d61756190c1f4de (patch)
tree14cd62d76b945e456f7fa43aebb5ad7ff6d6e4a2 /build
parentb154578500bc38f3b54857708d56425a463d4c50 (diff)
downloadcuttlefish-24c68568b6a3fe08009789ba4d61756190c1f4de.tar.gz
assemble_cvd: Use toybox cpio to unpack vendor ramdisk
Since GNU cpio could break the "while cpio -idu; do :;done <cpio.concatenated" loop due to its buffered IO reading too much of the input. Use "mkbootfs" to pack ramdisk as it yields more stable output than "find | cpio". The archive generated by "mkbootfs" has its entry sorted, assigned stable inode number, cleared mtime, uid and gid. Also format some lines of code to make clang-format happy. Bug: 185883642 Bug: 173134558 Test: launch_cvd -kernel_path kernel && check ~/cuttlefish_assembly Test: Run launch_cvd again and check that the repacked stripped_ramdisk.cpio is deterministic. Test: adb reboot recovery Change-Id: I1859ce475bc801f97f4f8e915f010e913dd2e2e7
Diffstat (limited to 'build')
-rw-r--r--build/Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/Android.bp b/build/Android.bp
index 76b8480bb..761eab757 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -60,6 +60,7 @@ cvd_host_tools = [
"lz4",
"make_f2fs",
"metrics",
+ "mkbootfs",
"mkbootimg",
"mkenvimage",
"modem_simulator",
@@ -77,6 +78,7 @@ cvd_host_tools = [
"stop_cvd",
"tapsetiff",
"tombstone_receiver",
+ "toybox",
"unpack_bootimg",
"vnc_server",
"webRTC",