commit 6480df804558a0a82c3695e32142976f9171dc0e
author Jin Qian <jinqian@google.com> Thu Jul 06 21:13:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 06 21:13:13 2017 +0000
tree 49d7df7ec70c6f2f040c9f7a4689ebd9d5266a86
parent 19750d03b96506e5cffe7c7307a6c6fd7100dee3
parent 4c8fa507c2f0ce31df5134ffdef992443da2306a

init: require e2fsdroid and mke2fs when building init am: 041f849548
am: f361c2560c

Change-Id: Ic85298e7340a6e61aeab5cfeadaf4cb7a24ade1f

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index fce424e..0c4225a 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 8fc354a..dc3360d 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -83,6 +83,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; \