commit 649003f40a51c5a083eb0ae19b3d87b78493caaa
author Jin Qian <jinqian@google.com> Thu Jul 06 11:43:45 2017 -0700
committer Jin Qian <jinqian@google.com> Thu Jul 06 11:45:06 2017 -0700
tree 47504c23fc42bb7831fc7d2984da07b4b703e76f
parent 9f65443cd4539d59cfc6c21e20a537bde2788403

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

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index af1e9d3..5d6d979 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -95,6 +95,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 866ea34..bf75f5a 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -85,6 +85,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; \