From 041f849548397803e2f458fd08d5e7b98909c8e4 Mon Sep 17 00:00:00 2001
From: Jin Qian <jinqian@google.com>
Date: Thu, 6 Jul 2017 11:43:45 -0700
Subject: [PATCH] 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 | 4 ++++
 init/Android.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/init/Android.bp b/init/Android.bp
index af1e9d375..5d6d9797e 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -95,6 +95,10 @@ cc_binary {
 
     name: "init",
     defaults: ["init_defaults"],
+    required: [
+        "e2fsdroid",
+        "mke2fs",
+    ],
     static_executable: true,
     srcs: [
         "bootchart.cpp",
diff --git a/init/Android.mk b/init/Android.mk
index 866ea34bb..bf75f5ab4 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -85,6 +85,10 @@ LOCAL_STATIC_LIBRARIES := \
     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; \