commit fd6c58ab1175bd4fe294f2f676f01c08a8bc4c98
author Jin Qian <jinqian@google.com> Thu Jul 06 11:43:45 2017 -0700
committer Jin Qian <jinqian@google.com> Thu Jul 20 11:54:02 2017 -0700
tree be1762c4d783a952a42eab3dcf40030d91ab523e
parent 722b103d149abd2c19e9e4c186444a1f9f9046e1

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
(cherry picked from commit 041f849548397803e2f458fd08d5e7b98909c8e4)

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 47578ea..8294598 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -94,6 +94,10 @@
 
     name: "init",
     defaults: ["init_defaults"],
+    required: [
+        "e2fsdroid",
+        "mke2fs",
+    ],
     static_executable: true,
     srcs: [
         "bootchart.cpp",

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 325614e..670edc0 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -89,6 +89,10 @@
     libavb \
     libkeyutils \
 
+LOCAL_REQUIRED_MODULES := \
+    e2fsdroid \
+    mke2fs \
+
 # Create symlinks.
 LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \