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
This commit is contained in:
Jin Qian 2017-07-06 11:43:45 -07:00
parent 3b15f44041
commit 041f849548
2 changed files with 8 additions and 0 deletions

View file

@ -95,6 +95,10 @@ cc_binary {
name: "init", name: "init",
defaults: ["init_defaults"], defaults: ["init_defaults"],
required: [
"e2fsdroid",
"mke2fs",
],
static_executable: true, static_executable: true,
srcs: [ srcs: [
"bootchart.cpp", "bootchart.cpp",

View file

@ -85,6 +85,10 @@ LOCAL_STATIC_LIBRARIES := \
libavb \ libavb \
libkeyutils \ libkeyutils \
LOCAL_REQUIRED_MODULES := \
e2fsdroid \
mke2fs \
# Create symlinks. # Create symlinks.
LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \ ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \